feat(jg):行政审批局

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-api/src/main/resources/mapper/CommonMapper.xml

@@ -3560,7 +3560,7 @@
         from
             privilege_company
         where
-            company_code = #{receiveCompanyCode}
+            company_code = #{receiveCompanyCode} and is_deleted = false
     </select>
 
     <select id="querySupervisionCompanyCode" resultType="java.lang.String">

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

 package com.yeejoin.amos.boot.module.statistics.api.mapper;
 
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  *  Mapper 接口
@@ -14,4 +15,13 @@ public interface CommonBaseMapper {
     String getOrgCodeByCompanyCode(String companyCode);
 
     String getCompanyCodeByOrgCode(String orgCode);
+
+
+    /**
+     * 按照 地市或者区县查询对应行政区划seq
+     *
+     * @param receiveCompanyCode 地市或者区县companyCode
+     * @return 地市对应行政区划seq
+     */
+    String selectCompanyRegionSeq(@Param("receiveCompanyCode") String receiveCompanyCode);
 }

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

@@ -74,7 +74,6 @@ public interface JGStatisticsMapper {
 
     /**
      *  告知类业务平均办理时效，统计维度：接收机构所在的行政区域;
-     *  由于告知类，接收机构为监管机构，receive_company_org_code为监管机构的orgCode，故还保持使用receive_company_org_code匹配orgCode即可
      *  @param dpFilterParamDto 过滤条件
      * @param orgCode 登录人或者选择区域转换后的orgCode
      * @return  告知类业务平均办理时效

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/CommonBaseMapper.xml

@@ -9,4 +9,13 @@
     <select id="getCompanyCodeByOrgCode" resultType="java.lang.String">
     select company_code from privilege_company where org_code = #{orgCode} limit 1
     </select>
+
+    <select id="selectCompanyRegionSeq" resultType="java.lang.String">
+        select
+            region_seq
+        from
+            privilege_company
+        where
+            company_code = #{receiveCompanyCode} and is_deleted = false
+    </select>
 </mapper>

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

@@ -1313,9 +1313,9 @@ public class JGDPStatisticsServiceImpl {
         List<String> yData = new ArrayList<>();
         regionModels.forEach(r -> {
             xData.add(r.getRegionName());
-            String orgCode = stCommonService.getAndSetOrgCode(r.getRegionCode().toString());
-            if (!ValidationUtil.isEmpty(orgCode)) {
-                yData.add(this.avgAndSumDealDate(countDtos.stream().filter(c -> c.getKeyStr().contains(orgCode)).collect(Collectors.toList())));
+            String selfAndChildRegion = stCommonService.getSelfAndChildRegion(r);
+            if (!ValidationUtil.isEmpty(selfAndChildRegion)) {
+                yData.add(this.avgAndSumDealDate(countDtos.stream().filter(c -> selfAndChildRegion.contains(stCommonService.castCompanyCode2RegionCode(c.getKeyStr()))).collect(Collectors.toList())));
             } else {
                 yData.add("0");
             }

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

@@ -22,6 +22,7 @@ import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipTechParamPipelineMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipmentCategoryMapper;
 import com.yeejoin.amos.feign.systemctl.Systemctl;
 import com.yeejoin.amos.feign.systemctl.model.RegionModel;
+import lombok.Getter;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.lucene.queryparser.classic.QueryParser;
 import org.apache.lucene.search.join.ScoreMode;
@@ -77,23 +78,24 @@ public class StCommonServiceImpl {
      */
     public final static String REGION_LEVEL_THIRD = "3";
 
-    private CommonBaseMapper commonMapper;
+    private final CommonBaseMapper commonMapper;
 
-    private RestHighLevelClient restHighLevelClient;
+    private final RestHighLevelClient restHighLevelClient;
 
-    private TZSCommonServiceImpl tzsCommonService;
+    private final TZSCommonServiceImpl tzsCommonService;
 
-    private EquipTechParamPipelineMapper techParamsPipelineMapper;
+    private final EquipTechParamPipelineMapper techParamsPipelineMapper;
 
-    private EquipmentCategoryMapper equipmentCategoryMapper;
+    private final EquipmentCategoryMapper equipmentCategoryMapper;
 
-    private ZLStatisticsMapper zlStatisticsMapper;
+    private final ZLStatisticsMapper zlStatisticsMapper;
 
-    private static Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
+    @Getter
+    private static final Map<String, String> regionCodeOrgCodeMap = new ConcurrentHashMap<>();
 
     private static Map<Integer, RegionModel> regionCodeRegionMap = new ConcurrentHashMap<>();
 
-    private static List<RegionModel> regionModels = new ArrayList<>();
+    private static final List<RegionModel> regionModels = new ArrayList<>();
 
     private static List<EquipmentCategoryDto> equipmentCategoryDtos;
 
@@ -111,10 +113,6 @@ public class StCommonServiceImpl {
         this.tzsCommonService = tzsCommonService;
     }
 
-    public static Map<String, String> getRegionCodeOrgCodeMap() {
-        return regionCodeOrgCodeMap;
-    }
-
     public static List<EquipmentCategoryDto> getEquipmentCategory() {
         return equipmentCategoryDtos;
     }
@@ -156,9 +154,18 @@ public class StCommonServiceImpl {
 
     public String getAndSetOrgCode(DPFilterParamDto dpFilterParamDto) {
         String cityCode = dpFilterParamDto.getCityCode();
+        this.setChildCompanyCodeByRegion(cityCode, dpFilterParamDto);
         return getAndSetOrgCode(cityCode);
     }
 
+    /**
+     * 按照regionCode查询区域下的公司
+     * @param cityCode           区域
+     * @param dpFilterParamDto   过滤条件
+     */
+    private void setChildCompanyCodeByRegion(String cityCode, DPFilterParamDto dpFilterParamDto) {
+    }
+
     public String getAndSetOrgCode(String cityCode) {
         String orgCode = regionCodeOrgCodeMap.get(cityCode);
         if (orgCode == null) {
@@ -551,4 +558,25 @@ public class StCommonServiceImpl {
             children.forEach(child -> buildSubtree(child, parentCodeMap));
         }
     }
+
+    /**
+     * 获取本级及子级区域code
+     * @param region 区域
+     * @return 本级及子级区域code
+     */
+    public String getSelfAndChildRegion(RegionModel region) {
+        return null;
+    }
+
+    /**
+     * 将单位code转行政区划
+     * @param companyCode 单位code
+     * @return 单位所在行政区划
+     */
+    public CharSequence castCompanyCode2RegionCode(String companyCode) {
+        String regionSeq = commonMapper.selectCompanyRegionSeq(companyCode);
+        Optional<RegionModel> optionalRegionModel = regionModels.stream().filter(r-> String.valueOf(r.getSequenceNbr()).equals(regionSeq)).findFirst();
+        optionalRegionModel.orElseThrow(()->new RuntimeException(""));
+        return null;
+    }
 }