diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java index 31e25fe1..36b5cd03 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java @@ -80,6 +80,12 @@ public class ProcessDraft implements Serializable { @ApiModelProperty(value = "项目id") private String projectId; + /** + * 节点id + */ + @ApiModelProperty(value = "节点id") + private String nodeId; + /**任务id*/ @ApiModelProperty(value = "任务id") private java.lang.String taskId; 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 4abed08b..06c82855 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 @@ -162,7 +162,7 @@ public class ActFlowCommonService { public String getNodeIdByTaskId(String taskId) { ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(taskId); if (approvalRecord == null) { - throw new JeroBootException("找不到对应的审批记录"); + return null; } else { return approvalRecord.getNodeId(); } diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java index ff2c97b8..f1a01a18 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/fb/controller/ProcessFbInfoController.java @@ -10,6 +10,7 @@ import com.jero.common.system.vo.LoginUser; import com.jero.modules.activiti.entity.ProcessNode; import com.jero.modules.activiti.mapper.ProcessNodeMapper; import com.jero.modules.activiti.process.common.entity.ProcessDraft; +import com.jero.modules.activiti.process.common.service.ActFlowCommonService; import com.jero.modules.activiti.process.common.service.ProcessDraftService; import com.jero.modules.activiti.process.fb.service.IProcessHandleService; import com.jero.modules.laws.common.util.CurrentUserUtil; @@ -61,6 +62,9 @@ public class ProcessFbInfoController { @Resource private HistoryService historyService; + @Resource + private ActFlowCommonService actFlowCommonService; + @DictPoint @GetMapping("/getNodeList") @ApiImplicitParams({ @@ -85,6 +89,9 @@ public class ProcessFbInfoController { queryWrapper.eq(!Objects.isNull(processDraft.getPrcType()), ProcessDraft::getPrcType, processDraft.getPrcType()); Page page = new Page<>(pageNo, pageSize); IPage sentList = processDraftService.page(page, queryWrapper); + sentList.getRecords().forEach(item -> { + item.setNodeId(actFlowCommonService.getNodeIdByTaskId(item.getTaskId())); + }); return Result.OK(sentList); }