From acae5616f87ac1c37ff5c9c2ea3a1bad30edd604 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期四, 07 三月 2024 21:55:24 +0800
Subject: [PATCH] update 修改获取当前任务
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java | 9 +++++----
ruoyi-modules/ruoyi-workflow/src/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 56c17a0..f84f1db 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.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 @@
}
/**
- * 鑾峰彇娴佺▼鐘舵��
+ * 鑾峰彇褰撳墠浠诲姟
*
* @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 ecf8b72..944d9d7 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.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 @@
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;
}
}
--
Gitblit v1.9.3