fix(大屏):大屏接口修改

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/java/com/yeejoin/amos/boot/module/statistics/api/mapper/JGStatisticsMapper.java

@@ -54,11 +54,11 @@ public interface JGStatisticsMapper {
 
     Long over15yearsCount(@Param("orgCode") String orgCode, @Param("time") String time);
 
-    Long constructionNoticeCount(@Param("orgCode") String orgCode);
+    Long constructionNoticeCount(@Param("dto") DPFilterParamDto dto);
 
-    Long changeCountByOrgCode(@Param("orgCode") String orgCode);
+    Long changeCountByOrgCode(@Param("dto") DPFilterParamDto dto);
 
-    List<Map<String, Object>> selectNoticeList(@Param("orgCode") String orgCode, @Param("time") String time);
+    List<Map<String, Object>> selectNoticeList(@Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamDto dto);
 
     Page<Map<String, Object>> selectNoticeDetailList(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamForDetailDto dpFilterParamDto);
 
@@ -70,7 +70,7 @@ public interface JGStatisticsMapper {
 
     Page<Map<String, Object>> selectYZNoticeDetailList(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamForDetailDto dpFilterParamDto);
 
-    List<Map<String, Object>> selectNoticeCountTopTen(@Param("orgCode") String orgCode, @Param("time") String time);
+    List<Map<String, Object>> selectNoticeCountTopTen(@Param("orgCode") String orgCode, @Param("time") String time, @Param("dto") DPFilterParamDto dto);
 
     /**
      *  告知类业务平均办理时效，统计维度：接收机构所在的行政区域;
@@ -100,9 +100,9 @@ public interface JGStatisticsMapper {
 
     Page<Map<String, Object>> countBizFinishedNumForDPListAll(@Param("page") Page<Map<String, Object>> page, @Param("orgCode") String orgCode, @Param("dto") DPFilterParamDto filterParamDto, @Param("treeValue") String treeValue);
 
-    Long getNoticeCountTopChart(@Param("dpFilterParamForDetailDto") DPFilterParamForDetailDto dpFilterParamForDetailDto);
+    Long getNoticeCountTopChart(@Param("dto") DPFilterParamForDetailDto dto);
 
     Page<Map<String, Object>> noticeCountTopPageNew(@Param("page") Page<Map<String, Object>> page, @Param("dpFilterParamForDetailDto") DPFilterParamForDetailDto dpFilterParamForDetailDto);
 
-    List<Map<String, Object>> noticeCountTopPageByUseUnitCode(@Param("unitCodeList") List<String> unitCodeList, @Param("dpFilterParamForDetailDto") DPFilterParamForDetailDto dpFilterParamForDetailDto);
+    List<Map<String, Object>> noticeCountTopPageByUseUnitCode(@Param("unitCodeList") List<String> unitCodeList, @Param("dto") DPFilterParamForDetailDto dto);
 }

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/JGDPStatisticsServiceImpl.java

@@ -1839,7 +1839,9 @@ public class JGDPStatisticsServiceImpl {
 
         return resultList;
     }
-
+    @FieldMapping({
+            @FieldMapping.FieldMap(sourceField = "cityCode", targetField = "companyCodes", serviceClass = StCommonServiceImpl.class, queryMethod = "getCompanyCodesByRegionCode"),
+    })
     public Map<String, Object> JGCenterMapCountForGlobal(DPFilterParamDto dpFilterParamDto) {
         Map<String, Object> result = new HashMap<>();
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
@@ -1865,20 +1867,19 @@ public class JGDPStatisticsServiceImpl {
         // 6.使用登记办理量
         this.staticsCenterMapCountDataForUseReg(result, orgCode);
         // 7.施工告知办理量
-        this.staticsCenterMapCountDataForConstructionNotice(result, orgCode);
+        this.staticsCenterMapCountDataForConstructionNotice(result, dpFilterParamDto);
         // 8.变更办理量
-        this.staticsCenterMapCountDataForChange(result, orgCode);
-
+        this.staticsCenterMapCountDataForChange(result, dpFilterParamDto);
         return result;
     }
 
-    private void staticsCenterMapCountDataForChange(Map<String, Object> result, String orgCode) {
-        Long num = jgStatisticsMapper.changeCountByOrgCode(orgCode);
+    private void staticsCenterMapCountDataForChange(Map<String, Object> result, DPFilterParamDto dpFilterParamDto) {
+        Long num = jgStatisticsMapper.changeCountByOrgCode(dpFilterParamDto);
         result.put(DPMapStatisticsItemEnum.CHANGE_COUNT.getCode(), num);
     }
 
-    private void staticsCenterMapCountDataForConstructionNotice(Map<String, Object> result, String orgCode) {
-        Long num = jgStatisticsMapper.constructionNoticeCount(orgCode);
+    private void staticsCenterMapCountDataForConstructionNotice(Map<String, Object> result, DPFilterParamDto dpFilterParamDto) {
+        Long num = jgStatisticsMapper.constructionNoticeCount(dpFilterParamDto);
         result.put(DPMapStatisticsItemEnum.CONSTRUCTION_NOTICE_COUNT.getCode(), num);
     }
 
@@ -1916,34 +1917,39 @@ public class JGDPStatisticsServiceImpl {
         }).collect(Collectors.toList());
     }
 
+    @FieldMapping({
+            @FieldMapping.FieldMap(sourceField = "cityCode", targetField = "companyCodes", serviceClass = StCommonServiceImpl.class, queryMethod = "getCompanyCodesByRegionCode"),
+    })
     public List<Map<String, Object>> noticeList(DPFilterParamDto dpFilterParamDto) {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if (orgCode == null) {
             return new ArrayList<>();
         }
         String time = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        return jgStatisticsMapper.selectNoticeList(orgCode, time);
+        return jgStatisticsMapper.selectNoticeList(orgCode, time, dpFilterParamDto);
     }
 
+    @FieldMapping({
+            @FieldMapping.FieldMap(sourceField = "cityCode", targetField = "companyCodes", serviceClass = StCommonServiceImpl.class, queryMethod = "getCompanyCodesByRegionCode"),
+    })
     public List<Map<String, Object>> noticeCountTop(DPFilterParamDto dpFilterParamDto) {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if (orgCode == null) {
             return new ArrayList<>();
         }
         String time = LocalDate.now().minusDays(29).format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        return jgStatisticsMapper.selectNoticeCountTopTen(orgCode, time);
+        return jgStatisticsMapper.selectNoticeCountTopTen(orgCode, time, dpFilterParamDto);
     }
 
+    @FieldMapping({
+            @FieldMapping.FieldMap(sourceField = "cityCode", targetField = "companyCodes", serviceClass = StCommonServiceImpl.class, queryMethod = "getCompanyCodesByRegionCode"),
+    })
     public Map<String, Object> noticeCountTopChart(DPFilterParamForDetailDto dpFilterParamForDetailDto) {
         List<RegionModel> regionModels = stCommonService.setRegionIfRootParent(dpFilterParamForDetailDto.getCityCode());
         List<Map<String, Object>> result = regionModels.parallelStream().map(r -> {
-            String orgCode = stCommonService.getAndSetOrgCode(r.getRegionCode() + "");
-            DPFilterParamForDetailDto dpFilterParamForDetailDtoForSearch = new DPFilterParamForDetailDto();
-            dpFilterParamForDetailDtoForSearch.setOrgCode(orgCode);
-            dpFilterParamForDetailDtoForSearch.setCityCode(r.getRegionCode() + "");
             Map<String, Object> itemResult = new HashMap<>();
             itemResult.put("xdata", r.getRegionName());
-            getNoticeCountTopChart(itemResult, dpFilterParamForDetailDtoForSearch);
+            getNoticeCountTopChart(itemResult, dpFilterParamForDetailDto);
             return itemResult;
         }).collect(Collectors.toList());
 
@@ -1970,6 +1976,7 @@ public class JGDPStatisticsServiceImpl {
         return returnMap;
     }
 
+    @FieldMapping({@FieldMapping.FieldMap(sourceField = "cityCode", paramIndex = 1, targetField = "companyCodes", serviceClass = StCommonServiceImpl.class, queryMethod = "getCompanyCodesByRegionCode"),})
     public Page<Map<String, Object>> noticeCountTopPage(Page<Map<String, Object>> page, DPFilterParamForDetailDto dpFilterParamForDetailDto) {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamForDetailDto.getCityCode());
         dpFilterParamForDetailDto.setOrgCode(orgCode);
@@ -2166,6 +2173,9 @@ public class JGDPStatisticsServiceImpl {
         return result;
     }
 
+    @FieldMapping({
+            @FieldMapping.FieldMap(sourceField = "cityCode", paramIndex = 1, targetField = "companyCodes", serviceClass = StCommonServiceImpl.class, queryMethod = "getCompanyCodesByRegionCode"),
+    })
     public Page<Map<String, Object>> noticeDetailList(Page<Map<String, Object>> page, DPFilterParamForDetailDto dpFilterParamDto) {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         if (orgCode == null) {