feat: 办理接口返回nodeId

laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/CommonVO.java

@@ -78,6 +78,12 @@ public class CommonVO {
     @ApiModelProperty("流程描述")
     private String prcMes;
 
+    /**
+     * 节点Id
+     */
+    @ApiModelProperty("节点Id")
+    private String nodeId;
+
     /**
      * 制修订计划说明
      */

laws-modules/src/main/java/com/jero/modules/activiti/process/common/service/ActFlowCommonService.java

@@ -137,6 +137,10 @@ public class ActFlowCommonService {
         approvalRecord.setCommitFile(commonVO.getCommitFile());
         approvalRecord.setFinishFlag(FinishFlagEnum.COMPLETE.getValue());
         approvalRecord.setEndTime(new Date());
+        // 使用流程引擎根据TaskId找到NodeId
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        String nodeId = task.getTaskDefinitionKey();
+        approvalRecord.setNodeId(nodeId);
         processApprovalRecordService.updateById(approvalRecord);
     }
 

laws-modules/src/main/java/com/jero/modules/activiti/process/esAbolish/service/impl/ProcessEsAbolishServiceImpl.java

@@ -178,6 +178,7 @@ public class ProcessEsAbolishServiceImpl extends ServiceImpl<ProcessEsAbolishMap
         commonVO.setTaskId(process.getTaskId());
         commonVO.setPrcMes(process.getPrcMes());
         commonVO.setDueTime(process.getDueTime());
+        commonVO.setNodeId(process.getNodeId());
         abolishData.setCommon(commonVO);
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsAbolish> lambdaQueryWrapper = new LambdaQueryWrapper<>();

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/service/impl/ProcessEsAnnualInitServiceImpl.java

@@ -180,6 +180,7 @@ public class ProcessEsAnnualInitServiceImpl extends ServiceImpl<ProcessEsAnnualI
         commonVO.setTaskId(process.getTaskId());
         commonVO.setPrcMes(process.getPrcMes());
         commonVO.setDueTime(process.getDueTime());
+        commonVO.setNodeId(process.getNodeId());
         annualInitDataVO.setCommonVO(commonVO);
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsAnnualInit> wrapper = new LambdaQueryWrapper<>();

laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualReport/service/impl/ProcessEsAnnualReportServiceImpl.java

@@ -227,6 +227,7 @@ public class ProcessEsAnnualReportServiceImpl extends ServiceImpl<ProcessEsAnnua
         commonVO.setPrcMes(process.getPrcMes());
         commonVO.setDueTime(process.getDueTime());
         commonVO.setTaskId(taskId);
+        commonVO.setNodeId(process.getNodeId());
         String processDescription = (String) runtimeService.getVariable(processInstanceId, "processDescription");
         commonVO.setProcessDescription(processDescription);
         annualReportDataVO.setCommonVO(commonVO);

laws-modules/src/main/java/com/jero/modules/activiti/process/esArchive/service/impl/ProcessEsArchiveServiceImpl.java

@@ -191,6 +191,7 @@ public class ProcessEsArchiveServiceImpl extends ServiceImpl<ProcessEsArchiveMap
         commonVO.setTaskId(process.getTaskId());
         commonVO.setPrcMes(process.getPrcMes());
         commonVO.setDueTime(process.getDueTime());
+        commonVO.setNodeId(process.getNodeId());
         archiveData.setCommon(commonVO);
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsArchive> lambdaQueryWrapper = new LambdaQueryWrapper<>();

laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/service/impl/ProcessEsChangeServiceImpl.java

@@ -173,6 +173,7 @@ public class ProcessEsChangeServiceImpl extends ServiceImpl<ProcessEsChangeMappe
         commonVO.setTaskId(process.getTaskId());
         commonVO.setPrcMes(process.getPrcMes());
         commonVO.setDueTime(process.getDueTime());
+        commonVO.setNodeId(process.getNodeId());
         changeData.setCommon(commonVO);
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsChange> lambdaQueryWrapper = new LambdaQueryWrapper<>();

laws-modules/src/main/java/com/jero/modules/activiti/process/esEnable/service/impl/ProcessEsEnableServiceImpl.java

@@ -174,6 +174,7 @@ public class ProcessEsEnableServiceImpl extends ServiceImpl<ProcessEsEnableMappe
         commonVO.setTaskId(process.getTaskId());
         commonVO.setPrcMes(process.getPrcMes());
         commonVO.setDueTime(process.getDueTime());
+        commonVO.setNodeId(process.getNodeId());
         enableData.setCommon(commonVO);
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsEnable> lambdaQueryWrapper = new LambdaQueryWrapper<>();

laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/service/impl/ProcessEsInitChangeServiceImpl.java

@@ -143,6 +143,7 @@ public class ProcessEsInitChangeServiceImpl extends ServiceImpl<ProcessEsInitCha
         commonVO.setDueTime(process.getDueTime());
         commonVO.setProcessDefinitionId(processDefinitionId);
         commonVO.setProcessInstanceId(processInstanceId);
+        commonVO.setNodeId(process.getNodeId());
         initChangeDataVO.setCommonVO(commonVO);
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsInitChange> lambdaQueryWrapper = new LambdaQueryWrapper<>();

laws-modules/src/main/java/com/jero/modules/activiti/process/esRecheck/service/impl/ProcessEsRecheckServiceImpl.java

@@ -163,6 +163,7 @@ public class ProcessEsRecheckServiceImpl extends ServiceImpl<ProcessEsRecheckMap
         commonVO.setTaskId(process.getTaskId());
         commonVO.setPrcMes(process.getPrcMes());
         commonVO.setDueTime(process.getDueTime());
+        commonVO.setNodeId(process.getNodeId());
         recheckData.setCommon(commonVO);
         // 获取流程实例数据
         LambdaQueryWrapper<ProcessEsRecheck> lambdaQueryWrapper = new LambdaQueryWrapper<>();