feat(statis):行政审批局

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/StCommonServiceImpl.java

@@ -98,7 +98,7 @@ public class StCommonServiceImpl {
     private static Map<Integer, RegionModel> regionCodeRegionMap = new ConcurrentHashMap<>();
 
     // 行政区域code对应监管/审批单位code Map
-    private static Map<Integer, List<String>> regionCodeCompanyCodeMap = new ConcurrentHashMap<>();
+    private static final Map<Integer, List<String>> regionCodeCompanyCodeMap = new ConcurrentHashMap<>();
 
     private static final List<RegionModel> regionModels = new ArrayList<>();
 
@@ -168,7 +168,7 @@ public class StCommonServiceImpl {
      * @param cityCode           区域
      * @param dpFilterParamBaseDto   过滤条件
      */
-    private void setChildCompanyCodeByRegion(String cityCode, DPFilterParamBaseDto dpFilterParamBaseDto) {
+    public void setChildCompanyCodeByRegion(String cityCode, DPFilterParamBaseDto dpFilterParamBaseDto) {
         RegionModel region = regionCodeRegionMap.get(Integer.valueOf(cityCode));
         dpFilterParamBaseDto.setCompanyCodes(regionCodeCompanyCodeMap.computeIfAbsent(Integer.valueOf(cityCode), k -> commonMapper.selectCompanyCodeByRegionCode(region.getSequenceNbr())));
     }

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/ZBGLImpl/YwblpjsxtjServiceImpl.java

@@ -11,6 +11,7 @@ import com.yeejoin.amos.boot.module.statistics.api.mapper.JGStatisticsMapper;
 import com.yeejoin.amos.boot.module.statistics.api.mapper.ZBGLStatisticsMapper;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
 import org.springframework.stereotype.Component;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -32,8 +33,10 @@ public class YwblpjsxtjServiceImpl implements IZBGLService {
         List<RegionModel> regionModels = stCommonService.setRegionIfRootParent(dpFilterParamForDetailDto.getCityCode());
         String orgCodeP = stCommonService.getAndSetOrgCode(dpFilterParamForDetailDto.getCityCode());
         DPFilterParamDto dpFilterParamDto = new DPFilterParamDto();
+        dpFilterParamDto.setCityCode(dpFilterParamForDetailDto.getCityCode());
+        stCommonService.setChildCompanyCodeByRegion(dpFilterParamForDetailDto.getCityCode(), dpFilterParamDto);
         //安装告知、维修告知、改造告知、移装告知
-        List<CountDto> noticCount = jgStatisticsMapper.queryNoticeAvgDayByReceiveCompany(dpFilterParamDto, orgCodeP);
+        List<CountDto> noticeCount = jgStatisticsMapper.queryNoticeAvgDayByReceiveCompany(dpFilterParamDto, orgCodeP);
         //使用登记、车用气瓶使用登记
         List<CountDto> useCount = jgStatisticsMapper.queryUseAvgDayByReceiveCompany(dpFilterParamDto, orgCodeP);
         //更名变更登记、改造变更登记、移装变更登记、单位变更登记、气瓶单位变更登记
@@ -72,23 +75,30 @@ public class YwblpjsxtjServiceImpl implements IZBGLService {
         }
         returnMap.put("legendData",legendData);
 
-        List xdata = new ArrayList();
-        List notic = new ArrayList();
-        List use = new ArrayList();
-        List change = new ArrayList();
-        List disable = new ArrayList();
-        List cancel = new ArrayList();
+        List<String> xdata = new ArrayList<>();
+        List<String> notic = new ArrayList<>();
+        List<String> use = new ArrayList<>();
+        List<String> change = new ArrayList<>();
+        List<String> disable = new ArrayList<>();
+        List<String> cancel = new ArrayList<>();
 
         regionModels.forEach(r -> {
             xdata.add(r.getRegionName());
-            String orgCode = stCommonService.getAndSetOrgCode(r.getRegionCode().toString());
-            notic.add(this.avgAndSumDealDate(noticCount.stream().filter(c -> c.getKeyStr().contains(orgCode)).collect(Collectors.toList())));
-            use.add(this.avgAndSumDealDate(useCount.stream().filter(c -> c.getKeyStr().contains(orgCode)).collect(Collectors.toList())));
-            change.add(this.avgAndSumDealDate(changeCount.stream().filter(c -> c.getKeyStr().contains(orgCode)).collect(Collectors.toList())));
-            disable.add(this.avgAndSumDealDate(disableCount.stream().filter(c -> c.getKeyStr().contains(orgCode)).collect(Collectors.toList())));
-            cancel.add(this.avgAndSumDealDate(cancelCount.stream().filter(c -> c.getKeyStr().contains(orgCode)).collect(Collectors.toList())));
+            String selfAndChildRegion = stCommonService.getSelfAndChildRegion(r);
+            if (!ValidationUtil.isEmpty(selfAndChildRegion)) {
+                notic.add(this.avgAndSumDealDate(noticeCount.stream().filter(c -> selfAndChildRegion.contains(stCommonService.castCompanyCode2RegionCode(c.getKeyStr()))).collect(Collectors.toList())));
+                use.add(this.avgAndSumDealDate(useCount.stream().filter(c -> selfAndChildRegion.contains(stCommonService.castCompanyCode2RegionCode(c.getKeyStr()))).collect(Collectors.toList())));
+                change.add(this.avgAndSumDealDate(changeCount.stream().filter(c -> selfAndChildRegion.contains(stCommonService.castCompanyCode2RegionCode(c.getKeyStr()))).collect(Collectors.toList())));
+                disable.add(this.avgAndSumDealDate(disableCount.stream().filter(c -> selfAndChildRegion.contains(stCommonService.castCompanyCode2RegionCode(c.getKeyStr()))).collect(Collectors.toList())));
+                cancel.add(this.avgAndSumDealDate(cancelCount.stream().filter(c -> selfAndChildRegion.contains(stCommonService.castCompanyCode2RegionCode(c.getKeyStr()))).collect(Collectors.toList())));
+            } else {
+                notic.add("0");
+                use.add("0");
+                change.add("0");
+                disable.add("0");
+                cancel.add("0");
+            }
         });
-
         returnMap.put("xdata",xdata);
         returnMap.put("notic",notic);
         returnMap.put("use",use);