From 895bd94491a6cf3bc66f45a6ec4180945f2114ec Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 28 Dec 2023 09:40:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2080022=20=E5=B9=B4=E5=BA=A6=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2-=E5=90=84=E9=83=A8=E9=97=A8=E4=B8=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=B8=8A=E6=8A=A5=EF=BC=9A=E6=9C=80=E5=90=8E=E5=BD=92?=
 =?UTF-8?q?=E6=A1=A3=E6=8F=90=E4=BA=A4=E4=B8=8D=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/ProcessESAnnualReportEndListener.java          | 6 ++++++
 .../esRevision/service/impl/EsRevisionServiceImpl.java      | 6 +++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/listener/ProcessESAnnualReportEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/listener/ProcessESAnnualReportEndListener.java
index 0de05646..9f4b4499 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/listener/ProcessESAnnualReportEndListener.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/listener/ProcessESAnnualReportEndListener.java
@@ -3,6 +3,7 @@ package com.jero.modules.activiti.process.esAnnualReport.listener;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualReport;
 import com.jero.modules.activiti.process.esAnnualReport.service.impl.ProcessEsAnnualReportServiceImpl;
+import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPRevisionType;
 import com.jero.modules.activiti.process.esRevision.entity.ProcessEsRevision;
 import com.jero.modules.activiti.process.esRevision.entity.vo.ESRevisionDataVO;
 import com.jero.modules.activiti.process.esRevision.service.EsRevisionService;
@@ -53,6 +54,11 @@ public class ProcessESAnnualReportEndListener implements ExecutionListener {
         annualReports.forEach(annualReport -> annualReport.setId(null));
         // 转换为企标计划数据并入库
         enterpriseStandardPlans = BeanCopyUtils.copyBeanList(annualReports, EnterpriseStandardPlan.class);
+        // 设置一些字段
+        // 制修订类型字段
+        for (EnterpriseStandardPlan esp : enterpriseStandardPlans) {
+            esp.setApplicationCategory(esp.getProjectType());
+        }
         espService.saveBatch(enterpriseStandardPlans);
         log.info("数据存入企标计划数据库");
         // 自动发起制修订流程
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index 9ef9db42..8ab03106 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -189,10 +189,10 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         // 人员
         processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, variables);
         // 根据流程实例id更新流程总表
-        String newStandardNo = esp.getNewEnStandardNo();
+        String standardNo = StrUtil.isNotBlank(esp.getNewEnStandardNo()) ? esp.getNewEnStandardNo() : esp.getOriginEnStandardNo();
         String newStandardName = esp.getNewEnStandardName();
-        String revisionType = esp.getApplicationCategory().equals(ESPRevisionType.ENACT.getValue()) ? "制定" : "修订";
-        String prcName = newStandardNo + "-" + newStandardName + "-" + revisionType;
+        String revisionType = esp.getProjectType().equals(ESPRevisionType.ENACT.getValue()) ? "制定" : "修订";
+        String prcName = standardNo + "-" + newStandardName + "-" + revisionType;
         Integer prcType = ProcessTypeEnum.ES_REVISION.getValue();
         actFlowCommonService.updateProcessAll(processInstanceId, mainDraftUser, prcName, null, prcType, null);
         processNodeLinkService.saveNodeUserLink(processDefinitionId, processInstanceId, this.getUserMap(variables));