From 0bc1cdeddc2a9b6d77a185c910dc6432711c5500 Mon Sep 17 00:00:00 2001
From: yjz <3131811435@qq.com>
Date: Fri, 19 Jan 2024 11:38:56 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B):=2080220?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessFbEntryChangeServiceImpl.java     |  5 +++++
 .../ProcessFbStandardConsultationServiceImpl.java | 15 +++++++++++++++
 .../ProcessFbStandardPurchaseServiceImpl.java     | 14 ++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
index d51c384c..65dfe339 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbEntryChangeServiceImpl.java
@@ -168,6 +168,11 @@ public class ProcessFbEntryChangeServiceImpl extends ServiceImpl<ProcessFbEntryC
         basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_ENTRY_CHANGE.getValue()); // 流程类型
         // 重复性校验
         duplicateCheck(processInfoVO.getBusinessId());
+        // 删除自己的草稿
+        String draftId = processInfoVO.getDraftId();
+        if (StringUtils.isNotBlank(draftId)) {
+            processDraftService.removeById(draftId);
+        }
         processHandleService.startProcess(processInfoVO);
 
         // 保存草稿用于强制撤销
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
index 5932bfe1..77a2b859 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardConsultationServiceImpl.java
@@ -15,6 +15,7 @@ import com.jero.modules.activiti.entity.ProcessNode;
 import com.jero.modules.activiti.entity.ProcessNodeLink;
 import com.jero.modules.activiti.enums.CommitFlagEnum;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
+import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.process.fb.common.ConsultationNodeSort;
 import com.jero.modules.activiti.process.fb.common.ConsultationTaskKey;
 import com.jero.modules.activiti.process.fb.common.FbCommon;
@@ -86,6 +87,9 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
     private ProcessApprovalRecordService processApprovalRecordService;
     @Resource
     private SendMessageAPI sendMessageAPI;
+
+    @Resource
+    private ProcessDraftService processDraftService;
     
     public static final String EXCEPTION = "目前还未开发，请联系管理员";
 
@@ -113,6 +117,12 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
         basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.FB_STANDARD_CONSULTATION)); // 流程定义id
 //        basicProcessInfoDTO.setProcessName(businessInfoDTO.getStandardNumber() + "-" + businessInfoDTO.getStandardName() + "-" + "征求意见"); // 流程名称
         basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_STANDARD_CONSULTATION.getValue()); // 流程类型
+
+        // 删除自己的草稿
+        String draftId = processInfoVO.getDraftId();
+        if (StringUtils.isNotBlank(draftId)) {
+            processDraftService.removeById(draftId);
+        }
         processHandleService.startProcess(processInfoVO);
 
         // 把各部所主管级领导数据存入关联人员表
@@ -125,6 +135,11 @@ public class ProcessFbStandardConsultationServiceImpl extends ServiceImpl<Proces
             linkList.add(link);
         });
         processFbConsultationUserLinkService.saveBatch(linkList, linkList.size());
+
+        // 保存草稿用于强制撤销
+        processInfoVO.setSaveSource("3");
+        processInfoVO.getBasicTaskInfoDTO().setTaskId(null);
+        saveToDraft(processInfoVO);
     }
 
     /**
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java
index 439795a3..c2caaba9 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/service/impl/ProcessFbStandardPurchaseServiceImpl.java
@@ -8,6 +8,7 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.common.util.UUIDUtils;
 import com.jero.modules.activiti.entity.ProcessAll;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
+import com.jero.modules.activiti.process.common.service.ProcessDraftService;
 import com.jero.modules.activiti.process.fb.common.ProcessDefinitionKey;
 import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
 import com.jero.modules.activiti.process.fb.entity.ProcessFbStandardPurchase;
@@ -48,6 +49,9 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl<ProcessFbS
     @Resource
     private IProcessHandleService processHandleService;
 
+    @Resource
+    private ProcessDraftService processDraftService;
+
     /**
      * @Author: liao
      * @Date: 2023/11/14 14:08
@@ -81,7 +85,17 @@ public class ProcessFbStandardPurchaseServiceImpl extends ServiceImpl<ProcessFbS
         basicProcessInfoDTO.setProcessDefinitionId(processHandleService.getDefinitionIdByKey(ProcessDefinitionKey.FB_STANDARD_PURCHASE)); // 流程定义id
         basicProcessInfoDTO.setProcessName(processName); // 流程名称
         basicProcessInfoDTO.setProcessType(ProcessTypeEnum.FB_STANDARD_PURCHASE.getValue()); // 流程类型
+        // 删除自己的草稿
+        String draftId = processInfoVO.getDraftId();
+        if (StringUtils.isNotBlank(draftId)) {
+            processDraftService.removeById(draftId);
+        }
         processHandleService.startProcess(processInfoVO);
+
+        // 保存草稿用于强制撤销
+        processInfoVO.setSaveSource("3");
+        processInfoVO.getBasicTaskInfoDTO().setTaskId(null);
+        saveToDraft(processInfoVO);
     }
 
     /**