lidongdong
2024-03-29 96769927d1d5ab9d90db78e013562804fce6711a
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComStreetServiceImpl.java
@@ -343,7 +343,8 @@
            populationSpecial.setGlTotal(comActDAO.getPopulationAge(streetId,80));
            vo.setSpecialStatisticsVo(populationSpecial);
        }
        return R.ok(populationSpecial);
        vo.setSpecialStatisticsVo(populationSpecial);
        return R.ok(vo);
    }
    @Override
@@ -357,7 +358,8 @@
//            endTime=year.toString().concat("-12-31");
//        }
        activityVO.setUnitCount(comActDAO.arriveUnit(belongTo));
        R r = communityService.institutionalUnitServiceAnalysis(year, null, null, null, null, null, belongTo, null, null);
        R r = communityService.institutionalUnitServiceAnalysis(year, null, null, null,
                null, null, belongTo, null, null,null);
        Object data = r.getData();
        String jsonString = JSON.toJSONString(data);
        ActivityAnalysisVO activityAnalysisVO = JSON.parseObject(jsonString, ActivityAnalysisVO.class);