1.bug18365

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/controller/ReportAnalysisController.java

@@ -7,8 +7,6 @@ import com.yeejoin.amos.boot.module.jg.api.dto.ReportAnalysisSearchDTO;
 import com.yeejoin.amos.boot.module.jg.api.service.IReportAnalysisService;
 import com.yeejoin.amos.boot.module.jg.api.vo.JgBizCountBaseVo;
 import com.yeejoin.amos.boot.module.jg.api.vo.JgBizEquipStateCountVo;
-import com.yeejoin.amos.boot.module.ymt.api.common.StringUtil;
-import com.yeejoin.amos.feign.rule.model.FactBaseModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.apache.commons.lang3.StringUtils;

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

@@ -99,8 +99,8 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
      * 缓存根节点的数据的接收机构数据
      */
     public void initRootOrgReceiveTree2Redis() {
-        getCompanyBos(rootOrgCode ,true);
-        getCompanyBos(rootOrgCode ,false);
+        getCompanyBos(rootOrgCode, true);
+        getCompanyBos(rootOrgCode, false);
     }
 
     private void initEquipCategoryCache() {
@@ -146,7 +146,7 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
             JgBizCountBaseVo vo = new JgBizCountBaseVo();
             vo.setBizGroup("施工告知");
             vo.setBizType(c.getBizType());
-            vo.setReceiveCompanyName(getReceiveCompanyNameReal(c.getReceiveCompanyCode(), companyCodeNameMap.get(c.getReceiveCompanyCode())));
+            vo.setReceiveCompanyName(companyCodeNameMap.get(c.getReceiveCompanyCode()));
             vo.setEquListName(getEquipCategoryNameByCode(c.getEquList()));
             vo.setEquCategoryName(getEquipCategoryNameByCode(c.getEquCategory()));
             vo.setEquDefineName(getEquipCategoryNameByCode(c.getEquDefine()));
@@ -157,7 +157,7 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
         }).collect(Collectors.toList());
     }
 
-    private String getReceiveCompanyNameReal(String receiveCompanyCode, String defaultName){
+    private String getReceiveCompanyNameReal(String receiveCompanyCode, String defaultName) {
         return commonService.getRegName(receiveCompanyCode, defaultName);
     }
 
@@ -219,7 +219,7 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
         return countVoSet.stream().map(c -> {
             JgBizCountBaseVo vo = new JgBizCountBaseVo();
             vo.setBizGroup("维保备案");
-            return buildJgBizCountBaseVo(countDataBOList, c, vo, mainLaunchesStatusList);
+            return buildJgBizCountBaseVo(countDataBOList, c, vo, mainLaunchesStatusList, false);
         }).collect(Collectors.toList());
     }
 
@@ -230,14 +230,19 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
         return countVoSet.stream().map(c -> {
             JgBizCountBaseVo vo = new JgBizCountBaseVo();
             vo.setBizGroup("使用登记");
-            return buildJgBizCountBaseVo(countDataBOList, c, vo, registerLaunchesStatusList);
+            return buildJgBizCountBaseVo(countDataBOList, c, vo, registerLaunchesStatusList, true);
         }).collect(Collectors.toList());
     }
 
 
-    private JgBizCountBaseVo buildJgBizCountBaseVo(List<JgBizCountDataBO> countDataBOList, JgBizCountDataDto c, JgBizCountBaseVo vo, List<String> registerLaunchesStatusList) {
+    private JgBizCountBaseVo buildJgBizCountBaseVo(List<JgBizCountDataBO> countDataBOList, JgBizCountDataDto c, JgBizCountBaseVo vo, List<String> registerLaunchesStatusList, Boolean isRegName) {
         vo.setBizType(c.getBizType());
-        vo.setReceiveCompanyName(getReceiveCompanyNameReal(c.getReceiveCompanyCode(), companyCodeNameMap.get(c.getReceiveCompanyCode())));
+        if (isRegName) {
+            vo.setReceiveCompanyName(getReceiveCompanyNameReal(c.getReceiveCompanyCode(), companyCodeNameMap.get(c.getReceiveCompanyCode())));
+        } else {
+            vo.setReceiveCompanyName(companyCodeNameMap.get(c.getReceiveCompanyCode()));
+
+        }
         vo.setEquListName(getEquipCategoryNameByCode(c.getEquList()));
         vo.setEquCategoryName(getEquipCategoryNameByCode(c.getEquCategory()));
         vo.setEquDefineName(getEquipCategoryNameByCode(c.getEquDefine()));
@@ -313,7 +318,7 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
     private List<CompanyBo> getCompanyBos(String orgCode, boolean isReg) {
         List<CompanyBo> companyBoList = commonMapper.queryJGCompanyCodeName(orgCode);
         // 设置接收机构名称与使用标志上登记机构名称一样
-        if(isReg){
+        if (isReg) {
             this.setCompany2RealName(companyBoList);
         }
         synchronized (this) {
@@ -331,7 +336,7 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
     }
 
     private void setCompany2RealName(List<CompanyBo> companyBoList) {
-        companyBoList.forEach(c->{
+        companyBoList.forEach(c -> {
             c.setCompanyName(getReceiveCompanyNameReal(c.getCompanyCode(), c.getCompanyName()));
         });
     }
@@ -389,11 +394,11 @@ public class ReportAnalysisServiceImpl implements IReportAnalysisService {
 
     private void filledParentCompanyName(JgBizCountDataDto c, JgBizEquipStateCountVo vo) {
         // 生产环境特殊数据处理，之前未限制只能选所
-        if( c.getReceiveCompanyCode().split("\\*").length  == 2){
+        if (c.getReceiveCompanyCode().split("\\*").length == 2) {
             // 直接上级（区县）
             String parentOrgCode = c.getReceiveCompanyCode().substring(0, c.getReceiveCompanyCode().lastIndexOf("*"));
             vo.setCountyManagementUnitName(orgCodeNameMap.get(parentOrgCode));
-        } else if( c.getReceiveCompanyCode().split("\\*").length > 2){
+        } else if (c.getReceiveCompanyCode().split("\\*").length > 2) {
             // 直接上级（区县）
             String parentOrgCode = c.getReceiveCompanyCode().substring(0, c.getReceiveCompanyCode().lastIndexOf("*"));
             vo.setCountyManagementUnitName(orgCodeNameMap.get(parentOrgCode));