feat: 所有流程办理接口新增nodeId字段回显

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();

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);
+        abolishData.setCommon(actFlowCommonService.getHandleCommon(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());
-        abolishData.setCommon(commonVO);
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsAbolish> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ProcessEsAbolish::getProcessInstanceId, processInstanceId);

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);
-        // 获取流程通用数据
+        archiveData.setCommon(actFlowCommonService.getHandleCommon(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);
         // 获取流程实例数据
         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();

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);
+        enableData.setCommon(actFlowCommonService.getHandleCommon(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());
-        enableData.setCommon(commonVO);
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsEnable> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ProcessEsEnable::getProcessInstanceId, processInstanceId);

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);
+        initChangeDataVO.setCommonVO(actFlowCommonService.getHandleCommon(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.setProcessDefinitionId(processDefinitionId);
-        commonVO.setProcessInstanceId(processInstanceId);
-        // 获取节点ID
-        commonVO.setNodeId(actFlowCommonService.getNodeIdByTaskId(taskId));
-        initChangeDataVO.setCommonVO(commonVO);
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsInitChange> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ProcessEsInitChange::getProcessInstanceId, processInstanceId);

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);
+        recheckData.setCommon(actFlowCommonService.getHandleCommon(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());
-        recheckData.setCommon(commonVO);
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsRecheck> lambdaQueryWrapper = new LambdaQueryWrapper<>();
         lambdaQueryWrapper.eq(ProcessEsRecheck::getProcessInstanceId, processInstanceId);