1.A071接收机构按照实际进行调整

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/CommonServiceImpl.java

@@ -420,6 +420,11 @@ public class CommonServiceImpl implements ICommonService {
     }
 
 
+    public String getRegName(String receiveCompanyCode, String defaultName) {
+        return  companyCodeRegNameMap.getOrDefault(receiveCompanyCode, defaultName);
+    }
+
+
     private void setNextDate(UseFlagParamDto useFlagParamDto, Map<String, Object> paramMap) {
         if (useFlagParamDto.getNextInspectionDate() != null) {
             paramMap.put("year", DateUtil.year(useFlagParamDto.getNextInspectionDate()) + "");

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/ReportAnalysisServiceImpl.java

@@ -47,6 +47,8 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
 
     private CommonMapper commonMapper;
 
+    private CommonServiceImpl commonService;
+
     private RestHighLevelClient restHighLevelClient;
 
     private Map<String, String> codeNameMap;
@@ -73,10 +75,11 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
     private List<String> registerLaunchesStatusList = Arrays.asList("一级待受理", "一级受理已驳回", "一级受理已撤回", "二级待受理", "二级受理已驳回", "二级受理已撤回", "三级待受理", "三级受理已驳回", "已完成");
 
 
-    public ReportAnalysisServiceImpl(CommonMapper commonMapper, RestHighLevelClient restHighLevelClient, RedisUtils redisUtils) {
+    public ReportAnalysisServiceImpl(CommonMapper commonMapper, RestHighLevelClient restHighLevelClient, RedisUtils redisUtils, CommonServiceImpl commonService) {
         this.commonMapper = commonMapper;
         this.restHighLevelClient = restHighLevelClient;
         this.redisUtils = redisUtils;
+        this.commonService = commonService;
     }
 
     @PostConstruct
@@ -137,7 +140,7 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
             JgBizCountBaseVo vo = new JgBizCountBaseVo();
             vo.setBizGroup("施工告知");
             vo.setBizType(c.getBizType());
-            vo.setReceiveCompanyName(companyCodeNameMap.get(c.getReceiveCompanyCode()));
+            vo.setReceiveCompanyName(getReceiveCompanyNameReal(c.getReceiveCompanyCode(), companyCodeNameMap.get(c.getReceiveCompanyCode())));
             vo.setEquListName(getEquipCategoryNameByCode(c.getEquList()));
             vo.setEquCategoryName(getEquipCategoryNameByCode(c.getEquCategory()));
             vo.setEquDefineName(getEquipCategoryNameByCode(c.getEquDefine()));
@@ -148,6 +151,10 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
         }).collect(Collectors.toList());
     }
 
+    private String getReceiveCompanyNameReal(String receiveCompanyCode, String defaultName){
+        return commonService.getRegName(receiveCompanyCode, defaultName);
+    }
+
     private Set<JgBizCountDataDto> distinctJgBizCountDataDtos(List<JgBizCountDataBO> countDataBOList) {
         return countDataBOList.stream().map(c -> {
             JgBizCountDataDto target = new JgBizCountDataDto();
@@ -224,7 +231,7 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
 
     private JgBizCountBaseVo buildJgBizCountBaseVo(List<JgBizCountDataBO> countDataBOList, JgBizCountDataDto c, JgBizCountBaseVo vo, List<String> registerLaunchesStatusList) {
         vo.setBizType(c.getBizType());
-        vo.setReceiveCompanyName(companyCodeNameMap.get(c.getReceiveCompanyCode()));
+        vo.setReceiveCompanyName(getReceiveCompanyNameReal(c.getReceiveCompanyCode(), companyCodeNameMap.get(c.getReceiveCompanyCode())));
         vo.setEquListName(getEquipCategoryNameByCode(c.getEquList()));
         vo.setEquCategoryName(getEquipCategoryNameByCode(c.getEquCategory()));
         vo.setEquDefineName(getEquipCategoryNameByCode(c.getEquDefine()));