From a70737442ae6ae95cb7540f50f3adcc281b200af Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 3 Jan 2024 17:02:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2079860=20=E4=BC=81=E6=A0=87=E5=BA=9F?=
 =?UTF-8?q?=E6=AD=A2/=E5=B0=81=E5=AD=98/=E5=90=AF=E7=94=A8=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B--=E9=A9=B3=E5=9B=9E=E5=90=8E=E5=8F=91=E8=B5=B7?=
 =?UTF-8?q?=E4=BA=BA=E7=BC=96=E8=BE=91=E5=90=8E=EF=BC=8C=E5=86=8D=E6=AC=A1?=
 =?UTF-8?q?=E5=AE=A1=E6=89=B9=E9=A1=B5=E9=9D=A2=E6=B2=A1=E6=9C=89=E5=9B=9E?=
 =?UTF-8?q?=E6=98=BE=E6=9C=80=E6=96=B0=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ProcessEsAbolishServiceImpl.java        | 10 ++++++++++
 .../impl/ProcessEsArchiveServiceImpl.java        | 16 +++++++++++++---
 .../service/impl/ProcessEsEnableServiceImpl.java | 10 ++++++++++
 .../impl/ProcessEsRecheckServiceImpl.java        |  9 +++++++++
 4 files changed, 42 insertions(+), 3 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 c94a7020..8a5f843a 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
@@ -180,6 +180,16 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
         if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
+        ProcessEsAbolish data = abolishData.getData();
+        if (data != null) {
+            updateById(data);
+            // 根据流程实例id更新流程总表
+            String prcName = commonVO.getPrcName();
+            String prcMes = commonVO.getPrcMes();
+            Date dueTime = commonVO.getDueTime();
+            Integer prcType = ProcessTypeEnum.ES_ABOLISH.getValue();
+            actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
+        }
         if (flowUser != null) {
             Map<String, Object> variables = setVariables(flowUser);
             Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
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 4c5423f2..91d1d9e5 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
@@ -165,10 +165,10 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
     }
 
     @Override
-    public void approval(ESArchiveDataVO abolishData, boolean pass) {
+    public void approval(ESArchiveDataVO archiveDataVO, boolean pass) {
         String userId = UserUtils.getUserId();
-        CommonVO commonVO = abolishData.getCommon();
-        Map<String, Object> flowUser = abolishData.getFlowUser();
+        CommonVO commonVO = archiveDataVO.getCommon();
+        Map<String, Object> flowUser = archiveDataVO.getFlowUser();
         String taskId = commonVO.getTaskId();
         // 获取流程实例ID
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
@@ -180,6 +180,16 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
         if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
+        ProcessEsArchive data = archiveDataVO.getData();
+        if (data != null) {
+            updateById(data);
+            // 根据流程实例id更新流程总表
+            String prcName = commonVO.getPrcName();
+            String prcMes = commonVO.getPrcMes();
+            Date dueTime = commonVO.getDueTime();
+            Integer prcType = ProcessTypeEnum.ES_ARCHIVE.getValue();
+            actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
+        }
         if (flowUser != null) {
             Map<String, Object> variables = setVariables(flowUser);
             Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java
index 6d3ecf2e..3d794eb5 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java
@@ -180,6 +180,16 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
         if (StrUtil.isBlank(taskId) && !actFlowCommonService.taskExists(taskId)) {
             throw new JeroBootException(ResultCommon.TASK_NOT_EXISTS);
         }
+        ProcessEsEnable data = enableData.getData();
+        if (data != null) {
+            updateById(data);
+            // 根据流程实例id更新流程总表
+            String prcName = commonVO.getPrcName();
+            String prcMes = commonVO.getPrcMes();
+            Date dueTime = commonVO.getDueTime();
+            Integer prcType = ProcessTypeEnum.ES_ENABLE.getValue();
+            actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
+        }
         if (flowUser != null) {
             Map<String, Object> variables = setVariables(flowUser);
             Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
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 1abd7478..86ca6821 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
@@ -222,6 +222,15 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
                 Integer prcType = ProcessTypeEnum.ES_RECHECK.getValue();
                 actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
             }
+            if (data != null) {
+                updateById(data);
+                // 根据流程实例id更新流程总表
+                String prcName = commonVO.getPrcName();
+                String prcMes = commonVO.getPrcMes();
+                Date dueTime = commonVO.getDueTime();
+                Integer prcType = ProcessTypeEnum.ES_RECHECK.getValue();
+                actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
+            }
         }
         // 设置流程变量
         runtimeService.setVariable(processInstanceId, "pass", pass);