From 791df50eab661b1c53300e2da319c6649a8ccfce Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 22 Nov 2023 15:14:25 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=AB=8B=E9=A1=B9=E5=8F=98=E6=9B=B4?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E4=B8=AD=E4=BF=9D=E5=AD=98=E5=88=B0=E8=8D=89?=
 =?UTF-8?q?=E7=A8=BF=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../process/common/service/ActFlowCommonService.java  | 11 +++++++++++
 .../controller/ProcessESInitChangeController.java     |  2 +-
 .../service/impl/ProcessEsInitChangeServiceImpl.java  | 10 ++++++----
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
index 8622aa3b..ac3b354a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
@@ -404,4 +404,15 @@ public class ActFlowCommonService {
         }
         return commonVO;
     }
+
+    public void removeDraft(CommonVO commonVO) {
+        String userId = UserUtils.getUserId();
+        String taskId = commonVO.getTaskId();
+        String processInstanceId = commonVO.getProcessInstanceId();
+        LambdaQueryWrapper<ProcessDraft> draftWrapper = new LambdaQueryWrapper<>();
+        draftWrapper.eq(ProcessDraft::getUserId, userId);
+        draftWrapper.eq(ProcessDraft::getTaskId, taskId);
+        draftWrapper.eq(ProcessDraft::getProcessInstanceId, processInstanceId);
+        processDraftService.remove(draftWrapper);
+    }
 }
\ No newline at end of file
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
index cbea053e..bc38fb46 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/controller/ProcessESInitChangeController.java
@@ -98,7 +98,7 @@ public class ProcessESInitChangeController {
     }
 
     /**
-     * 保存到待办
+     * 草稿办理
      * @param draftId
      * @param projectId
      */
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index e2ab7438..68e91a1b 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -204,6 +204,8 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         actFlowCommonService.updateApprovalInfo(commonVO, taskId, pass);
         // 审批节点
         actFlowCommonService.completeTask(taskId, userId);
+        // 删除草稿
+        actFlowCommonService.removeDraft(commonVO);
     }
 
     @Override
@@ -217,15 +219,15 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         if (existDraft != null) {
             // 根据原来的businessId删除业务主表数据
             String businessId = existDraft.getProjectId();
-            LambdaUpdateWrapper<ProcessEsInitChange> updateWrapper = new LambdaUpdateWrapper<>();
-            updateWrapper.eq(ProcessEsInitChange::getBusinessId, businessId);
-            updateWrapper.set(ProcessEsInitChange::getDelFlag, YesOrNoEnum.YES.getValue());
-            update(updateWrapper);
+            LambdaQueryWrapper<ProcessEsInitChange> qWrapper = new LambdaQueryWrapper<>();
+            qWrapper.eq(ProcessEsInitChange::getBusinessId, businessId);
+            remove(qWrapper);
         }
         // 生成唯一的businessId
         String newBusinessId = actFlowCommonService.getNewBusinessId();
         // 新增业务表数据
         dataList.forEach(e -> e.setBusinessId(newBusinessId));
+        dataList.forEach(e -> e.setId(null));
         saveBatch(dataList);
         // 新增草稿表数据
         actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_INIT_CHANGE, newBusinessId);