From acae5616f87ac1c37ff5c9c2ea3a1bad30edd604 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: Thu, 7 Mar 2024 21:55:24 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BF=AE=E6=94=B9=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E5=BD=93=E5=89=8D=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/workflow/controller/ActTaskController.java   | 9 +++++----
 .../main/java/org/dromara/workflow/utils/QueryUtils.java | 6 +++---
 2 files changed, 8 insertions(+), 7 deletions(-)

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<String> getBusinessStatus(@PathVariable String taskId) {
-        return R.ok("操作成功", WorkflowUtils.getBusinessStatusByTaskId(taskId));
+    @GetMapping("/getTaskById/{taskId}")
+    public R<TaskVo> 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;
     }
 }