From 2a01e59c25aaa91b52d9ab12f6cb248e7020ffca Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Thu, 25 Jan 2024 15:30:00 +0800
Subject: [PATCH] =?UTF-8?q?fix=2081258=20=E9=A1=B9=E7=9B=AE=E5=90=88?=
 =?UTF-8?q?=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B-=E5=BC=BA?=
 =?UTF-8?q?=E5=88=B6=E6=92=A4=E5=9B=9E=E7=9A=84=E6=95=B0=E6=8D=AE=E5=9C=A8?=
 =?UTF-8?q?=E5=8F=91=E8=B5=B7=E4=BA=BA=E8=8D=89=E7=A8=BF=E4=B8=AD=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessProjectAssessService.java          | 11 ++++++-----
 .../service/ProcessProjectNotMetService.java          | 10 ++++++----
 .../service/ProcessProjectStandardService.java        | 10 ++++++----
 3 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
index 8f30c4aa..fd60ab4a 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectassess/service/ProcessProjectAssessService.java
@@ -335,10 +335,7 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
     }
 
     public void startProcess(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO) {
-        //start 先保存一份初始草稿
-        processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
-        saveToDraft(processInfoVO);
-        //end 保存初始草稿结束
+
         ProcessProjectAssessVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
 
         ProcessProjectAssess processProjectAssess = businessInfoDTO.getProcessProjectAssess();
@@ -411,7 +408,11 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         processInfoVO.setUserInfoMap(userInfoMap);
         processHandleService.startProcess(processInfoVO);
 
-
+        //start 先保存一份初始草稿
+        processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
+        processInfoVO.setBasicTaskInfoDTO(processInfoVO.getBasicTaskInfoDTO().setTaskId(null));
+        saveToDraft(processInfoVO);
+        //end 保存初始草稿结束
     }
 
     public void approveTask(ProcessInfoVO<ProcessProjectAssessVO> processInfoVO, boolean pass) {
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
index ac9d3e53..cb3f1b0b 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectnotmet/service/ProcessProjectNotMetService.java
@@ -126,10 +126,7 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
     }
 
     public void startProcess(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO) {
-        //start 先保存一份初始草稿
-        processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
-        saveToDraft(processInfoVO);
-        //end 保存初始草稿结束
+
         ProcessProjectNotMetVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
         ProcessProjectNotMet processProjectNotMet = businessInfoDTO.getProcessProjectNotMet();
         if (processProjectNotMet == null){
@@ -170,6 +167,11 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
         wrapper.set(LawsEvaluationNotMet::getState, RECTIFICATION);
         wrapper.in(LawsEvaluationNotMet::getId,projectNotMetIdList);
         lawsEvaluationNotMetService.update(wrapper);
+        //start 先保存一份初始草稿
+        processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
+        processInfoVO.setBasicTaskInfoDTO(processInfoVO.getBasicTaskInfoDTO().setTaskId(null));
+        saveToDraft(processInfoVO);
+        //end 保存初始草稿结束
     }
 
     public void approveTask(ProcessInfoVO<ProcessProjectNotMetVO> processInfoVO, boolean pass) {
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
index 7acca0e5..69f2ef33 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/projectstandard/service/ProcessProjectStandardService.java
@@ -296,10 +296,7 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
     }
 
     public void startProcess(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO) {
-        //start 先保存一份初始草稿
-        processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
-        saveToDraft(processInfoVO);
-        //end 保存初始草稿结束
+
         ProcessProjectStandardVO businessInfoDTO = processInfoVO.getBusinessInfoDTO();
 
         ProcessProjectStandard processProjectStandard = businessInfoDTO.getProcessProjectStandard();
@@ -362,6 +359,11 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         userInfoMap.put(ProcessProjectStandardCommon.MANAGER_LEADER_LIST, distinctAllResponsibleUnitLeaderListJoin);
         processInfoVO.setUserInfoMap(userInfoMap);
         processHandleService.startProcess(processInfoVO);
+        //保存一份初始草稿
+        processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
+        processInfoVO.setBasicTaskInfoDTO(processInfoVO.getBasicTaskInfoDTO().setTaskId(null));
+        saveToDraft(processInfoVO);
+        //end 保存初始草稿结束
     }
 
     public void submit(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO) {