From 3638504a36cbe92defa9aa224935b1181794a0b2 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 28 Feb 2024 11:01:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=90=84=E9=83=A8=E9=97=A8=E4=B8=BB?=
 =?UTF-8?q?=E5=8A=A8=E4=B8=8A=E6=8A=A5=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=B2=A1=E6=9C=89=E5=88=A0=E9=99=A4=E7=9B=B8?=
 =?UTF-8?q?=E5=BA=94=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsAnnualReportServiceImpl.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

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 898e89b5..7a85770b 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
@@ -15,6 +15,7 @@ import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
+import com.jero.modules.activiti.process.esAnnualInit.entity.ProcessEsAnnualInit;
 import com.jero.modules.activiti.process.esAnnualReport.entity.ProcessEsAnnualReport;
 import com.jero.modules.activiti.process.esAnnualReport.entity.vo.AnnualReportDataVO;
 import com.jero.modules.activiti.process.esAnnualReport.mapper.ProcessEsAnnualReportMapper;
@@ -50,6 +51,7 @@ import java.io.InputStream;
 import java.util.*;
 import java.util.stream.Collectors;
 
+import static com.jero.modules.activiti.process.esAnnualInit.entity.AnnualInitTaskNameConstant.STANDARD_ENGINEER_COLLECT;
 import static com.jero.modules.activiti.process.esAnnualReport.entity.AnnualReportTaskNameConstant.*;
 
 /**
@@ -301,6 +303,14 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
                 userVariable.put("contactUserLeaderLeader", curLeader);
                 processNodeLinkService.incrementSaveNodeUserLink(processDefinitionId, processInstanceId, userVariable);
                 break;
+            case STANDARD_ENGINEER_COLLECT:
+                // 根据流程ID删除所有数据后新增
+                dataList = annualReportDataVO.getDataList();
+                wrapper.eq(ProcessEsAnnualReport::getProcessInstanceId, processInstanceId);
+                wrapper.eq(ProcessEsAnnualReport::getDelFlag, YesOrNoEnum.NO.getValue());
+                remove(wrapper);
+                saveBatch(dataList);
+                break;
         }
         // 更新审批表为完成，填充数据
         actFlowCommonService.updateApprovalInfo(commonVO, taskId, pass);