From 38fb356e2669e46c35e543e0e651e2c9be0dfdb8 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 30 Jan 2024 13:46:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2081475=20=E4=BC=81=E6=A0=87=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E7=AB=8B=E9=A1=B9/=E5=8F=98=E6=9B=B4=E6=B5=81?=
 =?UTF-8?q?=E7=A8=8B--=E5=8F=91=E8=B5=B7=E8=8A=82=E7=82=B9=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=90=8E=EF=BC=8C=E5=A1=AB=E5=86=99=E7=9A=84=E5=A4=87?=
 =?UTF-8?q?=E6=B3=A8=E5=92=8C=E9=99=84=E4=BB=B6=E6=B2=A1=E6=9C=89=E5=B8=A6?=
 =?UTF-8?q?=E5=85=A5=E5=88=B0=E4=BB=BB=E5=8A=A1=E8=8A=82=E7=82=B9=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E7=9A=84=E4=B8=BB=E8=B5=B7=E8=8D=89=E4=BA=BA=E5=8F=91?=
 =?UTF-8?q?=E8=B5=B7=E8=8A=82=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../esAbolish/service/impl/ProcessEsAbolishServiceImpl.java     | 2 ++
 .../service/impl/ProcessEsAnnualInitServiceImpl.java            | 2 ++
 .../service/impl/ProcessEsAnnualReportServiceImpl.java          | 2 ++
 .../esArchive/service/impl/ProcessEsArchiveServiceImpl.java     | 2 ++
 .../esChange/service/impl/ProcessEsChangeServiceImpl.java       | 2 ++
 .../esEnable/service/impl/ProcessEsEnableServiceImpl.java       | 2 ++
 .../service/impl/ProcessEsInitChangeServiceImpl.java            | 2 ++
 .../esRecheck/service/impl/ProcessEsRecheckServiceImpl.java     | 2 ++
 .../process/esRevision/service/impl/EsRevisionServiceImpl.java  | 2 ++
 9 files changed, 18 insertions(+)

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 41082ca6..29c72bbb 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
@@ -109,6 +109,8 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
         // 强制撤回
         commonVO.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_ABOLISH, jsonData);
+        // 更新审批表为完成，填充数据
+        actFlowCommonService.updateApprovalInfo(commonVO, taskId, true);
         // 自动完成第一个任务
         actFlowCommonService.completeTask(taskId, userId);
         // 根据流程实例id更新流程总表
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 ae17321f..5019abb1 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
@@ -132,6 +132,8 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         // 强制撤回
         commonVO.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_ANNUAL_INIT, jsonData);
+        // 更新审批表为完成，填充数据
+        actFlowCommonService.updateApprovalInfo(commonVO, taskId, true);
         // 自动完成第一个任务
         actFlowCommonService.completeTask(taskId, userId);
         // 根据流程实例id更新流程总表
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 ea8e98c8..5220a383 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
@@ -128,6 +128,8 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         // 强制撤回
         commonVO.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_ANNUAL_REPORT, jsonData);
+        // 更新审批表为完成，填充数据
+        actFlowCommonService.updateApprovalInfo(commonVO, taskId, true);
         // 自动完成第一个任务
         actFlowCommonService.completeTask(taskId, userId);
         // 根据流程实例id更新流程总表
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 cb2b44a4..ede902ec 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
@@ -112,6 +112,8 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
         // 强制撤回
         common.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(common, ProcessTypeEnum.ES_ARCHIVE, jsonData);
+        // 更新审批表为完成，填充数据
+        actFlowCommonService.updateApprovalInfo(common, taskId, true);
         // 自动完成第一个任务
         actFlowCommonService.completeTask(taskId, userId);
         // 根据流程实例id更新流程总表
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 b7da1b61..1a541de2 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
@@ -125,6 +125,8 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
         // 强制撤回
         common.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(common, ProcessTypeEnum.ES_CHANGE, jsonData);
+        // 更新审批表为完成，填充数据
+        actFlowCommonService.updateApprovalInfo(common, taskId, true);
         // 自动完成第一个任务
         actFlowCommonService.completeTask(taskId, userId);
         // 根据流程实例id更新流程总表
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 c520c173..b42a8f88 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
@@ -108,6 +108,8 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
         // 强制撤回
         common.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(common, ProcessTypeEnum.ES_ENABLE, jsonData);
+        // 更新审批表为完成，填充数据
+        actFlowCommonService.updateApprovalInfo(common, taskId, true);
         // 自动完成第一个任务
         actFlowCommonService.completeTask(taskId, userId);
         // 根据流程实例id更新流程总表
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 034fc333..29aeb2bc 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
@@ -138,6 +138,8 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         // 强制撤回
         commonVO.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(commonVO, ProcessTypeEnum.ES_INIT_CHANGE, jsonData);
+        // 更新审批表为完成，填充数据
+        actFlowCommonService.updateApprovalInfo(commonVO, taskId, true);
         // 自动完成第一个任务
         actFlowCommonService.completeTask(taskId, userId);
         // 根据流程实例id更新流程总表
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 279bab5d..bce79e49 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
@@ -104,6 +104,8 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
         // 强制撤回
         common.setProcessInstanceId(processInstanceId);
         actFlowCommonService.saveFirstNodeDraft(common, ProcessTypeEnum.ES_RECHECK, jsonData);
+        // 更新审批表为完成，填充数据
+        actFlowCommonService.updateApprovalInfo(common, taskId, true);
         // 自动完成第一个任务
         actFlowCommonService.completeTask(taskId, userId);
         // 根据流程实例id更新流程总表
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 8db3565c..edb65f71 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
@@ -149,6 +149,8 @@ public class EsRevisionServiceImpl extends ServiceImpl<EsRevisionMapper, Process
         Date dueTime = commonVO.getDueTime();
         Integer prcType = ProcessTypeEnum.ES_REVISION.getValue();
         actFlowCommonService.updateProcessAll(processInstanceId, userId, prcName, prcMes, prcType, dueTime);
+        // 更新审批表为完成，填充数据
+        actFlowCommonService.updateApprovalInfo(commonVO, taskId, true);
         // 自动完成第一个任务
         actFlowCommonService.completeTask(taskId, userId);
     }