From 7dc5b09fde327917a656ee22a3b338de3566a43d Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 24 Jul 2024 17:27:44 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=EF=BC=8C=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=EF=BC=8C?=
 =?UTF-8?q?=E6=9C=AA=E7=AC=A6=E5=90=88=E9=A1=B9=E8=AF=84=E4=BC=B0=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B=20=E5=8F=91=E8=B5=B7=E6=B5=81=E7=A8=8B=E6=97=B6?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BF=AB=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projectassess/service/ProcessProjectAssessService.java | 7 +++----
 .../projectnotmet/service/ProcessProjectNotMetService.java | 6 +++---
 .../service/ProcessProjectStandardService.java             | 6 +++---
 3 files changed, 9 insertions(+), 10 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 58e391ac..2a18a5cd 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
@@ -421,15 +421,14 @@ public class ProcessProjectAssessService extends ServiceImpl<ProcessProjectAsses
         userInfoMap.put(ProcessProjectAssessCommon.MANAGER_LEADER_LIST, distinctAllResponsibleUnitLeaderListJoin);
         processInfoVO.setUserInfoMap(userInfoMap);
         processHandleService.startProcess(processInfoVO);
-
+        //保存快照 start
+        processHandleService.saveToSnapshot(processInfoVO,CurrentUserUtil.getId());
+        //保存快照 end
         //start 先保存一份初始草稿
         processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
         processInfoVO.setBasicTaskInfoDTO(processInfoVO.getBasicTaskInfoDTO().setTaskId(null));
         saveToDraft(processInfoVO);
         //end 保存初始草稿结束
-        //保存快照 start
-        processHandleService.saveToSnapshot(processInfoVO,CurrentUserUtil.getId());
-        //保存快照 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 80c47395..e0a293ac 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
@@ -180,14 +180,14 @@ public class ProcessProjectNotMetService extends ServiceImpl<ProcessProjectNotMe
         wrapper.set(LawsEvaluationNotMet::getProcessInstanceId, processAll.getProcessInstanceId());
         wrapper.in(LawsEvaluationNotMet::getId,projectNotMetIdList);
         lawsEvaluationNotMetService.update(wrapper);
+        //保存快照 start
+        processHandleService.saveToSnapshot(processInfoVO,CurrentUserUtil.getId());
+        //保存快照 end
         //start 先保存一份初始草稿
         processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
         processInfoVO.setBasicTaskInfoDTO(processInfoVO.getBasicTaskInfoDTO().setTaskId(null));
         saveToDraft(processInfoVO);
         //end 保存初始草稿结束
-        //保存快照 start
-        processHandleService.saveToSnapshot(processInfoVO,CurrentUserUtil.getId());
-        //保存快照 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 11d81e08..b649fca5 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
@@ -413,14 +413,14 @@ public class ProcessProjectStandardService extends ServiceImpl<ProcessProjectSta
         userInfoMap.put(ProcessProjectStandardCommon.MANAGER_LEADER_LIST, distinctAllResponsibleUnitLeaderListJoin);
         processInfoVO.setUserInfoMap(userInfoMap);
         processHandleService.startProcess(processInfoVO);
+        //保存快照 start
+        processHandleService.saveToSnapshot(processInfoVO,CurrentUserUtil.getId());
+        //保存快照 end
         //保存一份初始草稿
         processInfoVO.setSaveSource(DraftCommon.INITIAL_SOURCE);
         processInfoVO.setBasicTaskInfoDTO(processInfoVO.getBasicTaskInfoDTO().setTaskId(null));
         saveToDraft(processInfoVO);
         //end 保存初始草稿结束
-        //保存快照 start
-        processHandleService.saveToSnapshot(processInfoVO,CurrentUserUtil.getId());
-        //保存快照 end
     }
 
     public void submit(ProcessInfoVO<ProcessProjectStandardVO> processInfoVO) {