From ef7709c0042ec0723cc3c652aefae353bcf0ab80 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 22 Nov 2023 14:38:24 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=B0=81=E5=AD=98=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=88=B0=E8=8D=89=E7=A8=BF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsArchiveServiceImpl.java     | 44 ++-----------------
 1 file changed, 4 insertions(+), 40 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java
index 3fb87e46..4346463f 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java
@@ -128,47 +128,11 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
     @Override
     public void saveToDraft(ESArchiveDataVO archiveDataVO) {
         CommonVO commonVO = archiveDataVO.getCommon();
-        String taskId = commonVO.getTaskId();
         ProcessEsArchive esArchive = archiveDataVO.getData();
-        String projectId = esArchive.getId();
-        if (StrUtil.isBlank(projectId)) {
-            save(esArchive);
-        } else {
-            // 先删后增
-            LambdaUpdateWrapper<ProcessDraft> draftWrapper = new LambdaUpdateWrapper<>();
-            draftWrapper.eq(ProcessDraft::getPrcType, ProcessTypeEnum.ES_ARCHIVE.getValue());
-            draftWrapper.eq(ProcessDraft::getCreateBy, UserUtils.getUserId());
-            draftWrapper.eq(ProcessDraft::getProjectId, projectId);
-            processDraftService.remove(draftWrapper);
-            saveOrUpdate(esArchive);
-        }
-        if (StrUtil.isBlank(taskId)) {
-            // 第一个节点点击保存没有taskId
-            List<ProcessDraft> draftList = new ArrayList<>();
-            ProcessDraft draft = new ProcessDraft();
-            draft.setProjectId(esArchive.getId());
-            draft.setPrcType(ProcessTypeEnum.ES_ARCHIVE.getValue());
-            draft.setPrcName(commonVO.getPrcName());
-            draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注
-            draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件
-            draft.setUserId(CurrentUserUtil.getId()); // 用户id
-            draftList.add(draft);
-            processDraftService.saveBatch(draftList);
-        } else {
-            String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
-            List<ProcessDraft> draftList = new ArrayList<>();
-            ProcessDraft draft = new ProcessDraft();
-            draft.setProjectId(esArchive.getId());
-            draft.setProcessInstanceId(processInstanceId);
-            draft.setPrcName(commonVO.getPrcName());
-            draft.setPrcType(ProcessTypeEnum.ES_ARCHIVE.getValue());
-            draft.setTaskId(taskId); // 任务id
-            draft.setHandleText(commonVO.getCommitText()); // 流程审批信息-备注
-            draft.setHandleFile(commonVO.getCommitFile()); // 流程审批信息-附件
-            draft.setUserId(CurrentUserUtil.getId()); // 用户id
-            draftList.add(draft);
-            processDraftService.saveBatch(draftList);
-        }
+        ProcessDraft existDraft = actFlowCommonService.getExistDraftAndRemove(commonVO, ProcessTypeEnum.ES_ARCHIVE);
+        if (existDraft != null) esArchive.setId(existDraft.getProjectId());
+        saveOrUpdate(esArchive);
+        actFlowCommonService.addDraft(commonVO, ProcessTypeEnum.ES_ARCHIVE, esArchive.getId());
     }
 
     public void startRunTask(ESArchiveDataVO archiveData) {