From 5f4d02252909743cc32da6972575befdbcd949f0 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Sun, 4 Feb 2024 15:28:53 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081066=20=E5=B9=B4=E5=BA=A6=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92--=E4=B8=9A=E5=8A=A1?=
 =?UTF-8?q?=E5=9F=BA=E6=9C=AC=E4=BF=A1=E6=81=AF=E5=88=97=E8=A1=A8=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5--=E6=8E=88=E6=9D=83=E9=83=A8=E9=97=A8=E7=9A=84?=
 =?UTF-8?q?=E9=99=90=E5=88=B6=E4=B8=8D=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsAnnualInitServiceImpl.java    | 13 +++++++++++++
 .../entity/ProcessEsAnnualReport.java           |  1 +
 .../impl/ProcessEsAnnualReportServiceImpl.java  | 17 +++++++++++++++++
 3 files changed, 31 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
index 1ec7fb64..23f54fe9 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+++ b/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());
+                }
             }
         });
     }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
index 23d9cee4..c7fd0764 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/entity/ProcessEsAnnualReport.java
+++ b/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;
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index 49d5f077..330b11d8 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/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())) {
             // 检查企标编号是否有效