From f646d802ef1dd3fd21d8ce8077844738e8e6dd77 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Mon, 22 Jul 2024 17:03:54 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E6=89=80=E6=9C=89?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8F=91=E8=B5=B7=E8=8A=82=E7=82=B9=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E5=BF=AB=E7=85=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsAbolishServiceImpl.java      | 16 +++++++++-------
 .../impl/ProcessEsAnnualInitServiceImpl.java   |  4 ++++
 .../impl/ProcessEsAnnualReportServiceImpl.java |  4 ++++
 .../impl/ProcessEsArchiveServiceImpl.java      | 18 +++++++++---------
 .../impl/ProcessEsChangeServiceImpl.java       |  4 ++++
 .../impl/ProcessEsInitChangeServiceImpl.java   | 11 ++++++-----
 .../impl/ProcessEsRecheckServiceImpl.java      | 12 ++++++++----
 .../service/impl/EsRevisionServiceImpl.java    |  4 ++++
 8 files changed, 48 insertions(+), 25 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
index 6b04cde4..0a3b0d95 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java
@@ -9,21 +9,16 @@ import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
-import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConstants;
-import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
 import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish;
 import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO;
-import com.jero.modules.activiti.process.esAbolish.service.ProcessEsAbolishService;
 import com.jero.modules.activiti.process.esAbolish.mapper.ProcessEsAbolishMapper;
-import com.jero.modules.activiti.process.esEnable.entity.ProcessEsEnable;
+import com.jero.modules.activiti.process.esAbolish.service.ProcessEsAbolishService;
 import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
-import com.jero.modules.activiti.process.projectassess.entity.ProcessProjectAssess;
-import com.jero.modules.activiti.process.projectassess.vo.ProcessProjectAssessVO;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
 import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
@@ -37,7 +32,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @author ThinkBook
@@ -109,6 +107,10 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
         // 强制撤回
         commonVO.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_ABOLISH, jsonData);
+        // 保存第一个节点的快照
+        commonVO.setTaskId(taskId);
+        ProcessInfoVO processInfoVO = processHandleService.transProcessInfoVO(commonVO, ProcessTypeEnum.ES_ABOLISH);
+        processHandleService.saveToSnapshot(processInfoVO, userId);
         // 更新审批表为完成，填充数据
         actFlowCommonService.updateApprovalInfo(commonVO, taskId, true);
         // 自动完成第一个任务
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
index e12f6422..f0ce1912 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java
@@ -131,6 +131,10 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         // 强制撤回
         commonVO.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_ANNUAL_INIT, jsonData);
+        // 保存第一个节点的快照
+        commonVO.setTaskId(taskId);
+        ProcessInfoVO processInfoVO = processHandleService.transProcessInfoVO(commonVO, ProcessTypeEnum.ES_ANNUAL_INIT);
+        processHandleService.saveToSnapshot(processInfoVO, userId);
         // 更新审批表为完成，填充数据
         actFlowCommonService.updateApprovalInfo(commonVO, taskId, true);
         // 自动完成第一个任务
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
index f9709ed4..2442a1e0 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java
@@ -130,6 +130,10 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         // 强制撤回
         commonVO.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_ANNUAL_REPORT, jsonData);
+        // 保存第一个节点的快照
+        commonVO.setTaskId(taskId);
+        ProcessInfoVO processInfoVO = processHandleService.transProcessInfoVO(commonVO, ProcessTypeEnum.ES_ANNUAL_REPORT);
+        processHandleService.saveToSnapshot(processInfoVO, userId);
         // 更新审批表为完成，填充数据
         actFlowCommonService.updateApprovalInfo(commonVO, taskId, true);
         // 自动完成第一个任务
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 fa56bfa7..eb27b0ab 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
@@ -1,7 +1,6 @@
 package com.jero.modules.activiti.process.esArchive.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.ResultCommon;
@@ -9,21 +8,15 @@ import com.jero.common.aspect.TranslationAspect;
 import com.jero.common.constant.enums.YesOrNoEnum;
 import com.jero.common.exception.JeroBootException;
 import com.jero.modules.activiti.enums.ProcessTypeEnum;
-import com.jero.modules.activiti.process.common.common.DraftCommon;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
-import com.jero.modules.activiti.process.common.entity.CounterSignNodeNameConstants;
-import com.jero.modules.activiti.process.common.entity.ProcessDraft;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.enums.StandardStateEnum;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
-import com.jero.modules.activiti.process.esAbolish.entity.ProcessEsAbolish;
-import com.jero.modules.activiti.process.esAbolish.entity.vo.ESAbolishDataVO;
 import com.jero.modules.activiti.process.esArchive.entity.ProcessEsArchive;
 import com.jero.modules.activiti.process.esArchive.entity.vo.ESArchiveDataVO;
-import com.jero.modules.activiti.process.esArchive.service.ProcessEsArchiveService;
 import com.jero.modules.activiti.process.esArchive.mapper.ProcessEsArchiveMapper;
+import com.jero.modules.activiti.process.esArchive.service.ProcessEsArchiveService;
 import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
-import com.jero.modules.activiti.process.fb.dto.BasicTaskInfoDTO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
@@ -39,7 +32,10 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
 * @author ThinkBook
@@ -112,6 +108,10 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
         // 强制撤回
         common.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(common, ProcessTypeEnum.ES_ARCHIVE, jsonData);
+        // 保存第一个节点的快照
+        common.setTaskId(taskId);
+        ProcessInfoVO processInfoVO = processHandleService.transProcessInfoVO(common, ProcessTypeEnum.ES_ARCHIVE);
+        processHandleService.saveToSnapshot(processInfoVO, userId);
         // 更新审批表为完成，填充数据
         actFlowCommonService.updateApprovalInfo(common, taskId, true);
         // 自动完成第一个任务
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
index f80b6a02..2393b2ce 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java
@@ -149,6 +149,10 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
         // 强制撤回
         common.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(common, ProcessTypeEnum.ES_CHANGE, jsonData);
+        // 保存第一个节点的快照
+        common.setTaskId(taskId);
+        ProcessInfoVO processInfoVO = processHandleService.transProcessInfoVO(common, ProcessTypeEnum.ES_CHANGE);
+        processHandleService.saveToSnapshot(processInfoVO, userId);
         // 更新审批表为完成，填充数据
         actFlowCommonService.updateApprovalInfo(common, taskId, true);
         // 自动完成第一个任务
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
index 65661825..d694d4dd 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java
@@ -18,9 +18,8 @@ import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPApplicatio
 import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectStatus;
 import com.jero.modules.activiti.process.esInitChange.entity.enums.ESPProjectType;
 import com.jero.modules.activiti.process.esInitChange.entity.vo.InitChangeDataVO;
-import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService;
 import com.jero.modules.activiti.process.esInitChange.mapper.ProcessEsInitChangeMapper;
-import com.jero.modules.activiti.process.esRevision.entity.ProcessEsRevision;
+import com.jero.modules.activiti.process.esInitChange.service.ProcessEsInitChangeService;
 import com.jero.modules.activiti.process.esRevision.service.EsRevisionService;
 import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
@@ -29,7 +28,6 @@ import com.jero.modules.activiti.service.ProcessAllService;
 import com.jero.modules.activiti.service.ProcessNodeLinkService;
 import com.jero.modules.laws.common.constant.FieldCommon;
 import com.jero.modules.laws.common.service.ILawsCommonService;
-import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardPlan;
 import com.jero.modules.laws.enterprise.service.ESSequenceNumberProvider;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService;
@@ -45,14 +43,13 @@ import org.activiti.engine.TaskService;
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.util.*;
 import java.util.stream.Collectors;
 
-import static com.jero.modules.activiti.process.esInitChange.entity.EsInitChangeConstant.*;
+import static com.jero.modules.activiti.process.esInitChange.entity.EsInitChangeConstant.STANDARDIZATION_CHECK;
 
 /**
  * @author ThinkBook
@@ -143,6 +140,10 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         // 强制撤回
         commonVO.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_INIT_CHANGE, jsonData);
+        // 保存第一个节点的快照
+        commonVO.setTaskId(taskId);
+        ProcessInfoVO processInfoVO = processHandleService.transProcessInfoVO(commonVO, ProcessTypeEnum.ES_INIT_CHANGE);
+        processHandleService.saveToSnapshot(processInfoVO, userId);
         // 更新审批表为完成，填充数据
         actFlowCommonService.updateApprovalInfo(commonVO, taskId, true);
         // 自动完成第一个任务
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
index 19d4887b..33113bc1 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java
@@ -11,11 +11,10 @@ import com.jero.modules.activiti.enums.ProcessTypeEnum;
 import com.jero.modules.activiti.process.common.entity.CommonVO;
 import com.jero.modules.activiti.process.common.enums.ProcessType;
 import com.jero.modules.activiti.process.common.service.ActFlowCommonService;
-import com.jero.modules.activiti.process.esChange.entity.ProcessEsChange;
 import com.jero.modules.activiti.process.esRecheck.entity.ProcessEsRecheck;
 import com.jero.modules.activiti.process.esRecheck.entity.vo.ESRecheckDataVO;
-import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService;
 import com.jero.modules.activiti.process.esRecheck.mapper.ProcessEsRecheckMapper;
+import com.jero.modules.activiti.process.esRecheck.service.ProcessEsRecheckService;
 import com.jero.modules.activiti.process.fb.dto.BasicProcessInfoDTO;
 import com.jero.modules.activiti.process.fb.service.IProcessHandleService;
 import com.jero.modules.activiti.process.fb.vo.ProcessInfoVO;
@@ -32,8 +31,9 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
-import java.util.*;
-
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
 
 import static com.jero.modules.activiti.process.esRecheck.entity.RecheckTaskNameConstant.*;
 
@@ -117,6 +117,10 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
         // 强制撤回
         common.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(common, ProcessTypeEnum.ES_RECHECK, jsonData);
+        // 保存第一个节点的快照
+        common.setTaskId(taskId);
+        ProcessInfoVO processInfoVO = processHandleService.transProcessInfoVO(common, ProcessTypeEnum.ES_RECHECK);
+        processHandleService.saveToSnapshot(processInfoVO, userId);
         // 更新审批表为完成，填充数据
         actFlowCommonService.updateApprovalInfo(common, taskId, true);
         // 自动完成第一个任务
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
index eae2db14..f9acff4c 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esRevision/service/impl/EsRevisionServiceImpl.java
@@ -166,6 +166,10 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         // 强制撤回
         commonVO.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_REVISION, jsonData);
+        // 保存第一个节点的快照
+        commonVO.setTaskId(taskId);
+        ProcessInfoVO processInfoVO = processHandleService.transProcessInfoVO(commonVO, ProcessTypeEnum.ES_REVISION);
+        processHandleService.saveToSnapshot(processInfoVO, userId);
         // 根据流程实例id更新流程总表
         String prcName = commonVO.getPrcName();
         String prcMes = commonVO.getPrcMes();