From 7f97597606a18a1474363577dbee5efd26bab71b Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 22 Nov 2023 16:01:28 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=89=80=E6=9C=89=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=E5=8A=9E=E7=90=86=E6=8E=A5=E5=8F=A3=E6=96=B0=E5=A2=9EnodeId?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E5=9B=9E=E6=98=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/service/ActFlowCommonService.java    | 17 +++++++++++++++++
 .../impl/ProcessEsAbolishServiceImpl.java       | 11 +----------
 .../impl/ProcessEsArchiveServiceImpl.java       | 11 +----------
 .../impl/ProcessEsEnableServiceImpl.java        | 11 +----------
 .../impl/ProcessEsInitChangeServiceImpl.java    | 14 +-------------
 .../impl/ProcessEsRecheckServiceImpl.java       | 11 +----------
 6 files changed, 22 insertions(+), 53 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
index ac3b354a..3a5f1d35 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java
@@ -405,6 +405,23 @@ public class ActFlowCommonService {
         return commonVO;
     }
 
+    public CommonVO getHandleCommon(String taskId) {
+        String processInstanceId = this.getProcessInstanceIdByTaskId(taskId);
+        String processDefinitionId = this.getProcessDefId(processInstanceId);
+        // 获取流程通用数据
+        ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
+        CommonVO commonVO = new CommonVO();
+        commonVO.setPrcName(process.getPrcName());
+        commonVO.setTaskId(process.getTaskId());
+        commonVO.setPrcMes(process.getPrcMes());
+        commonVO.setDueTime(process.getDueTime());
+        commonVO.setProcessDefinitionId(processDefinitionId);
+        commonVO.setProcessInstanceId(processInstanceId);
+        // 获取节点ID
+        commonVO.setNodeId(this.getNodeIdByTaskId(taskId));
+        return commonVO;
+    }
+
     public void removeDraft(CommonVO commonVO) {
         String userId = UserUtils.getUserId();
         String taskId = commonVO.getTaskId();
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 16641d44..dcdb960a 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
@@ -150,16 +150,7 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
         ESAbolishDataVO abolishData = new ESAbolishDataVO();
         // 使用流程引擎根据taskId找到流程实例Id
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
-        String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
-        // 获取流程通用数据
-        ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
-        CommonVO commonVO = new CommonVO();
-        commonVO.setPrcName(process.getPrcName());
-        commonVO.setTaskId(process.getTaskId());
-        commonVO.setPrcMes(process.getPrcMes());
-        commonVO.setDueTime(process.getDueTime());
-        commonVO.setNodeId(process.getNodeId());
-        abolishData.setCommon(commonVO);
+        abolishData.setCommon(actFlowCommonService.getHandleCommon(taskId));
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsAbolish> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ProcessEsAbolish::getProcessInstanceId, processInstanceId);
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 b024a75f..c7aec828 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
@@ -149,15 +149,7 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
         ESArchiveDataVO archiveData = new ESArchiveDataVO();
         // 使用流程引擎根据taskId找到流程实例Id
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
-        // 获取流程通用数据
-        ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
-        CommonVO commonVO = new CommonVO();
-        commonVO.setPrcName(process.getPrcName());
-        commonVO.setTaskId(process.getTaskId());
-        commonVO.setPrcMes(process.getPrcMes());
-        commonVO.setDueTime(process.getDueTime());
-        commonVO.setNodeId(process.getNodeId());
-        archiveData.setCommon(commonVO);
+        archiveData.setCommon(actFlowCommonService.getHandleCommon(taskId));
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsArchive> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ProcessEsArchive::getProcessInstanceId, processInstanceId);
@@ -167,7 +159,6 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
         return archiveData;
     }
 
-
     @Override
     public void approval(ESArchiveDataVO abolishData, boolean pass) {
         String userId = UserUtils.getUserId();
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 8547bdcb..be4c428f 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
@@ -147,16 +147,7 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
         ESEnableDataVO enableData = new ESEnableDataVO();
         // 使用流程引擎根据taskId找到流程实例Id
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
-        String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
-        // 获取流程通用数据
-        ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
-        CommonVO commonVO = new CommonVO();
-        commonVO.setPrcName(process.getPrcName());
-        commonVO.setTaskId(process.getTaskId());
-        commonVO.setPrcMes(process.getPrcMes());
-        commonVO.setDueTime(process.getDueTime());
-        commonVO.setNodeId(process.getNodeId());
-        enableData.setCommon(commonVO);
+        enableData.setCommon(actFlowCommonService.getHandleCommon(taskId));
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsEnable> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ProcessEsEnable::getProcessInstanceId, processInstanceId);
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 68e91a1b..b96cdef5 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
@@ -133,19 +133,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         InitChangeDataVO initChangeDataVO = new InitChangeDataVO();
         // 使用流程引擎根据taskId找到流程实例Id
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
-        String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
-        // 获取流程通用数据
-        ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
-        CommonVO commonVO = new CommonVO();
-        commonVO.setPrcName(process.getPrcName());
-        commonVO.setTaskId(process.getTaskId());
-        commonVO.setPrcMes(process.getPrcMes());
-        commonVO.setDueTime(process.getDueTime());
-        commonVO.setProcessDefinitionId(processDefinitionId);
-        commonVO.setProcessInstanceId(processInstanceId);
-        // 获取节点ID
-        commonVO.setNodeId(actFlowCommonService.getNodeIdByTaskId(taskId));
-        initChangeDataVO.setCommonVO(commonVO);
+        initChangeDataVO.setCommonVO(actFlowCommonService.getHandleCommon(taskId));
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsInitChange> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId);
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 8c6e055d..08b60118 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
@@ -135,16 +135,7 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
         ESRecheckDataVO recheckData = new ESRecheckDataVO();
         // 使用流程引擎根据taskId找到流程实例Id
         String processInstanceId = actFlowCommonService.getProcessInstanceIdByTaskId(taskId);
-        String processDefinitionId = actFlowCommonService.getProcessDefId(processInstanceId);
-        // 获取流程通用数据
-        ProcessAll process = processAllService.getByProcessInstanceId(processInstanceId);
-        CommonVO commonVO = new CommonVO();
-        commonVO.setPrcName(process.getPrcName());
-        commonVO.setTaskId(process.getTaskId());
-        commonVO.setPrcMes(process.getPrcMes());
-        commonVO.setDueTime(process.getDueTime());
-        commonVO.setNodeId(process.getNodeId());
-        recheckData.setCommon(commonVO);
+        recheckData.setCommon(actFlowCommonService.getHandleCommon(taskId));
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsRecheck> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ProcessEsRecheck::getProcessInstanceId, processInstanceId);