From 79f4752b8aab0312f66570b3aad3a10b89cd8763 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 7 Aug 2024 11:05:26 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E9=87=8D=E6=B1=BD=E5=B9=B4=E5=BA=A6?=
 =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=B5=81=E7=A8=8B=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../listener/ProcessESAnnualInitEndListener.java             | 5 +----
 .../service/impl/ProcessEsAnnualInitServiceImpl.java         | 3 +++
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/ProcessESAnnualInitEndListener.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/ProcessESAnnualInitEndListener.java
index 93df48f4..da33367c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/ProcessESAnnualInitEndListener.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/listener/ProcessESAnnualInitEndListener.java
@@ -9,7 +9,6 @@ import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPRevisionTy
 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;
-import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.laws.common.constant.FieldCommon;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardPlanService;
@@ -43,9 +42,6 @@ public class ProcessESAnnualInitEndListener implements ExecutionListener {
     @Resource
     private EnterpriseStandardUtil esUtil;
 
-    @Resource
-    private ProcessAllService processAllService;
-
     /**
      * 流程结束之后需要把数据存入企标计划数据库
      *
@@ -59,6 +55,7 @@ public class ProcessESAnnualInitEndListener implements ExecutionListener {
         // 根据流程实例Id找到所有流程业务数据
         LambdaQueryWrapper<ProcessEsAnnualInit> esAnnualInitWrapper = new LambdaQueryWrapper<>();
         esAnnualInitWrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId);
+        esAnnualInitWrapper.eq(ProcessEsAnnualInit::getExecutionId, delegateExecution.getId());
         List<ProcessEsAnnualInit> annualInits = annualInitService.list(esAnnualInitWrapper);
         if (annualInits == null || annualInits.isEmpty()) {
             log.info("年度制修订标准化发起流程结束 监听执行器未找到流程业务数据");
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 e317f77f..4773f61d 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
@@ -271,6 +271,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                 break;
             case STANDARD_ENGINEER_COLLECT:
                 // do nothing now
+                wrapper.eq(ProcessEsAnnualInit::getExecutionId, executionId);
                 break;
         }
         wrapper.eq(ProcessEsAnnualInit::getProcessInstanceId, processInstanceId);
@@ -446,6 +447,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
                         throw new JeroBootException("提交的新企标编号中有重复企标编号,请检查！");
                     }
                 }
+                List<String> idList = dataList.stream().map(ProcessEsAnnualInit::getId).collect(Collectors.toList());
+                wrapper.in(ProcessEsAnnualInit::getId, idList);
                 remove(wrapper);
                 saveBatch(dataList);
                 break;