fix: 81066 年度制修订计划--业务基本信息列表导入--授权部门的限制不正确

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java

@@ -98,6 +98,9 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
     @Resource
     private TranslationAspect translationAspect;
 
+    @Resource
+    private ILawsEnterpriseStandardService esService;
+
     @Override
     public void startProcess(AnnualInitDataVO annualInitData) {
         // 流程Key
@@ -526,6 +529,12 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
     }
 
     private void cleanData(List<ProcessEsAnnualInit> list) {
+        // 查找所有企标 并转换成key为标准编号的map
+        LambdaQueryWrapper<LawsEnterpriseStandard> esWrapper = new LambdaQueryWrapper<>();
+        esWrapper.eq(LawsEnterpriseStandard::getDelFlag, YesOrNoEnum.NO.getValue());
+        Map<String, List<LawsEnterpriseStandard>> esMap =
+                esService.list(esWrapper).stream().collect(Collectors.groupingBy(LawsEnterpriseStandard::getStandardNumber));
+
         list.forEach(item -> {
             // 如果是制定则去除掉所有的原企标名称 原企标编号
             if (ESPProjectType.ENACT.getValue().equals(item.getProjectType())) {
@@ -542,6 +551,10 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                 item.setChangeStatus(ESPChangeType.ADD.getValue());
             } else {
                 item.setChangeStatus(ESPChangeType.CHANGE.getValue());
+                List<LawsEnterpriseStandard> esList = esMap.get(item.getOriginEnStandardNo());
+                if (esList != null && !esList.isEmpty()) {
+                    item.setOriginEnStandardName(esList.get(0).getStandardName());
+                }
             }
         });
     }

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java

@@ -235,6 +235,7 @@ public class ProcessEsAnnualReport implements Serializable {
     /**
      * 零部件名称
      */
+    @Excel(name = "零部件名称", width = 15, orderNum = "15")
     @Dict(dictTable = "laws_part_name", dicCode = "code", dicText = "name")
     @ApiModelProperty(value = "零部件名称")
     private String componentName;

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java

@@ -98,6 +98,9 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
     @Resource
     private SendMessageAPI sendMessageAPI;
 
+    @Resource
+    private ILawsEnterpriseStandardService esService;
+
     @Override
     public void startProcess(AnnualReportDataVO annualReportData) {
         // 流程Key
@@ -429,6 +432,12 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
     }
 
     private void cleanData(List<ProcessEsAnnualReport> list) {
+        // 查找所有企标 并转换成key为标准编号的map
+        LambdaQueryWrapper<LawsEnterpriseStandard> esWrapper = new LambdaQueryWrapper<>();
+        esWrapper.eq(LawsEnterpriseStandard::getDelFlag, YesOrNoEnum.NO.getValue());
+        Map<String, List<LawsEnterpriseStandard>> esMap =
+                esService.list(esWrapper).stream().collect(Collectors.groupingBy(LawsEnterpriseStandard::getStandardNumber));
+
         list.forEach(item -> {
             // 如果是制定则去除掉所有的原企标名称 原企标编号
             if (ESPProjectType.ENACT.getValue().equals(item.getProjectType())) {
@@ -445,6 +454,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                 item.setChangeStatus(ESPChangeType.ADD.getValue());
             } else {
                 item.setChangeStatus(ESPChangeType.CHANGE.getValue());
+                List<LawsEnterpriseStandard> esList = esMap.get(item.getOriginEnStandardNo());
+                if (esList != null && !esList.isEmpty()) {
+                    item.setOriginEnStandardName(esList.get(0).getStandardName());
+                }
             }
         });
     }
@@ -543,6 +556,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         if (!excelUtils.validDict("esp_revision_type", projectType, null, null, true, listDict)) {
             return "'制修订类型'无效。";
         }
+        // 新企标名称不能为空
+        if (StrUtil.isBlank(newEnStandardName)) {
+            errMsg.append("'新企标名称'不能为空。");
+        }
         // 修订
         if (projectType.equals(ESPProjectType.MODIFY.getName())) {
             // 检查企标编号是否有效