feat(jg):更新null值调整

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

@@ -1033,6 +1033,7 @@ public class JGDPStatisticsServiceImpl {
         Map<String, Object> result = new HashMap<>();
         // 近30天
         this.setDefaultFilter30(dpFilterParamDto);
+        stCommonService.setChildCompanyCodeByRegion(dpFilterParamDto.getCityCode(), dpFilterParamDto);
         result.put("xdata", Arrays.asList("安装告知", "监督检验", "使用登记", "定期检验", "变更登记", "注销报废"));
         // 进行中
         List<Long> everyFlowingNum = this.countBizDataInFlowing(dpFilterParamDto);
@@ -2060,7 +2061,7 @@ public class JGDPStatisticsServiceImpl {
         }
     }
 
-    private List<Long> countBizDataInFlowingForDetail(DPFilterParamDto dpFilterParamDto, String businessType) {
+    private List<Long>  countBizDataInFlowingForDetail(DPFilterParamDto dpFilterParamDto, String businessType) {
         // 1.统计各业务办理量注意要和x轴顺序一致
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamDto.getCityCode());
         // 省、市、区县为按照行政区划进行编码的，公司的code为行政区划编码
@@ -2095,6 +2096,7 @@ public class JGDPStatisticsServiceImpl {
                 filterParamDto.setBeginDate(dpFilterParamForDetailDto.getTimeSearchOne().getBeginDate());
                 filterParamDto.setEndDate(dpFilterParamForDetailDto.getTimeSearchOne().getEndDate());
             }
+            stCommonService.setChildCompanyCodeByRegion(filterParamDto.getCityCode(), filterParamDto);
             Map<String, Object> itemResult = new HashMap<>();
             itemResult.put("xdata", r.getRegionName());
             List<Long> ydata = this.countBizFinishedNumForDetail(filterParamDto, dpFilterParamForDetailDto.getTreeValue());
@@ -2160,10 +2162,7 @@ public class JGDPStatisticsServiceImpl {
     public Page<Map<String, Object>> queryBizCycleDataDetailList(DPFilterParamForDetailDto dpFilterParamForDetailDto, Page<Map<String, Object>> page) {
         String orgCode = stCommonService.getAndSetOrgCode(dpFilterParamForDetailDto.getCityCode());
         Page<Map<String, Object>> maps = null;
-        DPFilterParamDto filterParamDto = new DPFilterParamDto();
-        filterParamDto.setCityCode(dpFilterParamForDetailDto.getCityCode());
-        filterParamDto.setCompanyName(dpFilterParamForDetailDto.getCompanyName());
-        filterParamDto.setSuperviseUnitName(dpFilterParamForDetailDto.getSuperviseUnitName());
+        DPFilterParamDto filterParamDto = getDpFilterParamDto(dpFilterParamForDetailDto);
         if (null != dpFilterParamForDetailDto.getTimeSearchOne()) {
             filterParamDto.setBeginDate(dpFilterParamForDetailDto.getTimeSearchOne().getBeginDate());
             filterParamDto.setEndDate(dpFilterParamForDetailDto.getTimeSearchOne().getEndDate());
@@ -2186,6 +2185,15 @@ public class JGDPStatisticsServiceImpl {
         return maps;
     }
 
+    private DPFilterParamDto getDpFilterParamDto(DPFilterParamForDetailDto dpFilterParamForDetailDto) {
+        DPFilterParamDto filterParamDto = new DPFilterParamDto();
+        filterParamDto.setCityCode(dpFilterParamForDetailDto.getCityCode());
+        filterParamDto.setCompanyName(dpFilterParamForDetailDto.getCompanyName());
+        filterParamDto.setSuperviseUnitName(dpFilterParamForDetailDto.getSuperviseUnitName());
+        stCommonService.setChildCompanyCodeByRegion(dpFilterParamForDetailDto.getCityCode(), filterParamDto);
+        return filterParamDto;
+    }
+
     public List<Map<String, Object>> noticeListBusinessType(DPFilterParamForDetailDto dpFilterParamDto) {
         List<HashMap<String, Object>> enumList = NoticBusinessTypeEnum.getEnumList();
         List<Map<String, Object>> result = new ArrayList<>();