diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java index 56c17a0f0..f84f1db60 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java @@ -15,6 +15,7 @@ import org.dromara.common.web.core.BaseController; import org.dromara.workflow.domain.bo.*; import org.dromara.workflow.domain.vo.TaskVo; import org.dromara.workflow.service.IActTaskService; +import org.dromara.workflow.utils.QueryUtils; import org.dromara.workflow.utils.WorkflowUtils; import org.flowable.engine.TaskService; import org.springframework.validation.annotation.Validated; @@ -222,13 +223,13 @@ public class ActTaskController extends BaseController { } /** - * 获取流程状态 + * 获取当前任务 * * @param taskId 任务id */ - @GetMapping("/getBusinessStatus/{taskId}") - public R getBusinessStatus(@PathVariable String taskId) { - return R.ok("操作成功", WorkflowUtils.getBusinessStatusByTaskId(taskId)); + @GetMapping("/getTaskById/{taskId}") + public R getTaskById(@PathVariable String taskId) { + return R.ok(QueryUtils.getTask(taskId)); } diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/QueryUtils.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/QueryUtils.java index ecf8b728c..944d9d78b 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/QueryUtils.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/utils/QueryUtils.java @@ -5,7 +5,6 @@ import lombok.AccessLevel; import lombok.NoArgsConstructor; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.tenant.helper.TenantHelper; -import org.dromara.workflow.domain.vo.ParticipantVo; import org.dromara.workflow.domain.vo.TaskVo; import org.flowable.engine.ProcessEngine; import org.flowable.engine.history.HistoricActivityInstanceQuery; @@ -147,8 +146,9 @@ public class QueryUtils { return null; } TaskVo taskVo = BeanUtil.toBean(task, TaskVo.class); - ParticipantVo participantVo = WorkflowUtils.getCurrentTaskParticipant(taskId); - taskVo.setParticipantVo(participantVo); + taskVo.setMultiInstance(WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey()) != null); + String businessStatus = WorkflowUtils.getBusinessStatus(taskVo.getProcessInstanceId()); + taskVo.setBusinessStatus(businessStatus); return taskVo; } }