From 3cb464d7144cb165550f0e74f5a01aeb74d59676 Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Sun, 29 Sep 2024 09:37:23 +0800
Subject: [PATCH] =?UTF-8?q?add=20update=20=E5=B9=B4=E5=BA=A6=E5=88=B6?=
 =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92=E6=B5=81=E7=A8=8B=20?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=97=B6=E4=BF=9D=E5=AD=98=E5=BF=AB=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/ProcessAnnualInitService.java     | 51 +++++++++----------
 1 file changed, 23 insertions(+), 28 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java
index dfadb94f..08828528 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/annualinit/service/ProcessAnnualInitService.java
@@ -102,20 +102,7 @@ public class ProcessAnnualInitService extends ServiceImpl<ProcessAnnualInitMappe
         processHandleService.saveToDraft(processInfoVO, CurrentUserUtil.getId());
         //end 保存初始草稿结束
         //保存快照 start
-        // 获取流程通用数据
-        ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
-        if(!Objects.isNull(process)){
-            BasicProcessInfoDTO processInfoDTO = new BasicProcessInfoDTO();
-            processInfoDTO.setProcessName(process.getPrcName());
-            processInfoDTO.setProcessType(process.getPrcType());
-            processInfoDTO.setProcessDefinitionId(process.getProcessDefinitionId());
-            processInfoDTO.setProcessInstanceId(process.getProcessInstanceId());
-            processInfoDTO.setProcessDescription(process.getPrcMes());
-            processInfoDTO.setProcessDueDate(process.getDueTime());
-            processInfoVO.setBasicProcessInfoDTO(processInfoDTO);
-            // 保存快照
-            processHandleService.saveToSnapshot(processInfoVO,CurrentUserUtil.getId());
-        }
+        saveToSnapshot(processInfoVO, processInstanceId);
         //保存快照 end
     }
 
@@ -165,6 +152,27 @@ public class ProcessAnnualInitService extends ServiceImpl<ProcessAnnualInitMappe
         // 完成任务
         Map<String, Object> variables = new HashMap<>();
         taskService.complete(processDTO.getTaskId(), variables);
+
+        //保存快照 start
+        saveToSnapshot(processInfoVO, processInstanceId);
+        //保存快照 end
+    }
+
+    private void saveToSnapshot(ProcessInfoVO<ProcessAnnualInitVO> processInfoVO, String processInstanceId) {
+        // 获取流程通用数据
+        ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
+        if(!Objects.isNull(process)){
+            BasicProcessInfoDTO processInfoDTO = new BasicProcessInfoDTO();
+            processInfoDTO.setProcessName(process.getPrcName());
+            processInfoDTO.setProcessType(process.getPrcType());
+            processInfoDTO.setProcessDefinitionId(process.getProcessDefinitionId());
+            processInfoDTO.setProcessInstanceId(process.getProcessInstanceId());
+            processInfoDTO.setProcessDescription(process.getPrcMes());
+            processInfoDTO.setProcessDueDate(process.getDueTime());
+            processInfoVO.setBasicProcessInfoDTO(processInfoDTO);
+            // 保存快照
+            processHandleService.saveToSnapshot(processInfoVO, CurrentUserUtil.getId());
+        }
     }
 
     public void approveTask(ProcessInfoVO<ProcessAnnualInitVO> processInfoVO, boolean pass) {
@@ -206,20 +214,7 @@ public class ProcessAnnualInitService extends ServiceImpl<ProcessAnnualInitMappe
             default:
         }
         //保存快照 start
-        // 获取流程通用数据
-        ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
-        if(!Objects.isNull(process)){
-            BasicProcessInfoDTO basicProcessInfoDTO = new BasicProcessInfoDTO();
-            basicProcessInfoDTO.setProcessName(process.getPrcName());
-            basicProcessInfoDTO.setProcessType(process.getPrcType());
-            basicProcessInfoDTO.setProcessDefinitionId(process.getProcessDefinitionId());
-            basicProcessInfoDTO.setProcessInstanceId(process.getProcessInstanceId());
-            basicProcessInfoDTO.setProcessDescription(process.getPrcMes());
-            basicProcessInfoDTO.setProcessDueDate(process.getDueTime());
-            processInfoVO.setBasicProcessInfoDTO(basicProcessInfoDTO);
-            // 保存快照
-            processHandleService.saveToSnapshot(processInfoVO,CurrentUserUtil.getId());
-        }
+        saveToSnapshot(processInfoVO, processInstanceId);
         //保存快照 end
     }