From fec7454cb55a4d7d17a2653c23e5375baf621f74 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 7 Feb 2024 17:22:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081657=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(=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E5=8C=96=E5=8F=91=E8=B5=B7)=EF=BC=88=E9=83=A8=E6=89=80?=
 =?UTF-8?q?=E8=81=94=E7=BB=9C=E4=BA=BA=E9=80=89=E5=8F=96=E5=AE=A1=E6=89=B9?=
 =?UTF-8?q?=E4=BA=BA=EF=BC=89=20=E9=A9=B3=E5=9B=9E=E5=90=8E=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=EF=BC=8C=E9=A9=B3=E5=9B=9E=E7=9A=84=E9=82=A3=E4=B8=AA?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=BF=98=E5=9C=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/ProcessEsAnnualInitServiceImpl.java  | 11 +++++++++++
 .../modules/activiti/service/ProcessAllService.java   |  6 ++++++
 .../service/ProcessApprovalRecordService.java         |  6 ++++++
 3 files changed, 23 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 676f08e9..6c3feb06 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
@@ -24,6 +24,7 @@ import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.service.ProcessAllService;
+import com.jero.modules.activiti.service.ProcessApprovalRecordService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
 import com.jero.modules.activiti.util.ExcelUtils;
 import com.jero.modules.laws.common.util.ImportUtil;
@@ -97,6 +98,9 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
     @Resource
     private ILawsEnterpriseStandardService esService;
 
+    @Resource
+    private ProcessApprovalRecordService parService;
+
     @Override
     public void startProcess(AnnualInitDataVO annualInitData) {
         // 流程Key
@@ -107,6 +111,13 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         String userId = UserUtils.getUserId();
         // 业务数据
         List<ProcessEsAnnualInit> dataList = annualInitData.getDataList();
+        // 如果dataList中有流程实例Id，则需要去删除对应流程
+        ProcessEsAnnualInit processEsAnnualInit = dataList.get(0);
+        String oldPrcId = processEsAnnualInit.getProcessInstanceId();
+        if (StrUtil.isNotBlank(oldPrcId)) {
+            processAllService.deleteByPrcId(oldPrcId);
+            parService.deleteByPrcId(oldPrcId);
+        }
         // 设置流程变量
         Map<String, Object> actVariables = this.setVariables(annualInitData);
         // 删除草稿
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
index 47ba7834..180fcda2 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessAllService.java
@@ -419,4 +419,10 @@ public class ProcessAllService extends ServiceImpl<ProcessAllMapper, ProcessAll>
                             .set(ProcessEsInspectDelayApply::getLiaisons, toUserId));
         }
     }
+
+    public void deleteByPrcId(String prcId) {
+        LambdaQueryWrapper<ProcessAll> processAllLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        processAllLambdaQueryWrapper.eq(ProcessAll::getProcessInstanceId, prcId);
+        remove(processAllLambdaQueryWrapper);
+    }
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
index a3dc447f..6fc1b3a8 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/service/ProcessApprovalRecordService.java
@@ -130,4 +130,10 @@ public class ProcessApprovalRecordService extends ServiceImpl<ProcessApprovalRec
         ProcessApprovalRecord approvalRecord = this.getOne(wrapper);
         return approvalRecord;
     }
+
+    public void deleteByPrcId(String oldPrcId) {
+        LambdaQueryWrapper<ProcessApprovalRecord> processAllLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        processAllLambdaQueryWrapper.eq(ProcessApprovalRecord::getProcessInstanceId, oldPrcId);
+        remove(processAllLambdaQueryWrapper);
+    }
 }