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 58b52c55..a1ce0268 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 @@ -99,6 +99,9 @@ public class ProcessDraft implements Serializable { /**用户id*/ @ApiModelProperty(value = "用户id") private java.lang.String userId; + /**节点名称*/ + @ApiModelProperty(value = "节点名称") + private java.lang.String nodeName; @TableField(exist = false) private static final long serialVersionUID = 1L; 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 06c82855..fa9a67f5 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 @@ -159,13 +159,8 @@ public class ActFlowCommonService { processApprovalRecordService.updateById(approvalRecord); } - public String getNodeIdByTaskId(String taskId) { - ProcessApprovalRecord approvalRecord = processApprovalRecordService.getToDoByTaskId(taskId); - if (approvalRecord == null) { - return null; - } else { - return approvalRecord.getNodeId(); - } + public ProcessApprovalRecord getNodeIdByTaskId(String taskId) { + return processApprovalRecordService.getToDoByTaskId(taskId); } /** @@ -400,7 +395,8 @@ public class ActFlowCommonService { commonVO.setTaskId(taskId); commonVO.setProcessInstanceId(draft.getProcessInstanceId()); if (StrUtil.isNotBlank(taskId)) { - commonVO.setNodeId(this.getNodeIdByTaskId(taskId)); + ProcessApprovalRecord record = this.getNodeIdByTaskId(taskId); + commonVO.setNodeId(record.getNodeId()); } return commonVO; } @@ -418,7 +414,8 @@ public class ActFlowCommonService { commonVO.setProcessDefinitionId(processDefinitionId); commonVO.setProcessInstanceId(processInstanceId); // 获取节点ID - commonVO.setNodeId(this.getNodeIdByTaskId(taskId)); + ProcessApprovalRecord record = this.getNodeIdByTaskId(taskId); + commonVO.setNodeId(record.getNodeId()); return commonVO; } 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 f1a01a18..25876774 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 @@ -1,5 +1,6 @@ package com.jero.modules.activiti.process.fb.controller; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; @@ -7,6 +8,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.jero.common.api.vo.Result; import com.jero.common.aspect.annotation.DictPoint; import com.jero.common.system.vo.LoginUser; +import com.jero.modules.activiti.entity.ProcessApprovalRecord; import com.jero.modules.activiti.entity.ProcessNode; import com.jero.modules.activiti.mapper.ProcessNodeMapper; import com.jero.modules.activiti.process.common.entity.ProcessDraft; @@ -90,7 +92,11 @@ public class ProcessFbInfoController { Page page = new Page<>(pageNo, pageSize); IPage sentList = processDraftService.page(page, queryWrapper); sentList.getRecords().forEach(item -> { - item.setNodeId(actFlowCommonService.getNodeIdByTaskId(item.getTaskId())); + ProcessApprovalRecord record = actFlowCommonService.getNodeIdByTaskId(item.getTaskId()); + if (record != null) { + item.setNodeId(record.getNodeId()); + item.setNodeName(record.getTaskName()); + } }); return Result.OK(sentList); }