From 9a14e906427ff401b49037c3033ca25b10a66f4b Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期二, 12 三月 2024 22:09:17 +0800
Subject: [PATCH] fix 修复驳回查询当前任务错误
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 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..9f50cdc 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
@@ -14,13 +14,16 @@
import org.dromara.common.web.core.BaseController;
import org.dromara.workflow.domain.bo.*;
import org.dromara.workflow.domain.vo.TaskVo;
+import org.dromara.workflow.domain.vo.VariableVo;
import org.dromara.workflow.service.IActTaskService;
-import org.dromara.workflow.utils.WorkflowUtils;
+import org.dromara.workflow.utils.QueryUtils;
import org.flowable.engine.TaskService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
+import java.util.List;
import java.util.Map;
+import java.util.Set;
/**
* 浠诲姟绠＄悊 鎺у埗灞�
@@ -222,13 +225,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));
}
@@ -244,4 +247,24 @@
public R<Void> updateAssignee(@PathVariable String[] taskIds, @PathVariable String userId) {
return toAjax(actTaskService.updateAssignee(taskIds, userId));
}
+
+ /**
+ * 鏌ヨ娴佺▼鍙橀噺
+ *
+ * @param taskId 浠诲姟id
+ */
+ @GetMapping("/getInstanceVariable/{taskId}")
+ public R<List<VariableVo>> getProcessInstVariable(@PathVariable String taskId) {
+ return R.ok(actTaskService.getInstanceVariable(taskId));
+ }
+
+ /**
+ * 鑾峰彇鍙┏鍥炲緱浠诲姟鑺傜偣
+ *
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ */
+ @GetMapping("/getTaskNodeList/{processInstanceId}")
+ public R<Set<TaskVo>> getNodeList(@PathVariable String processInstanceId) {
+ return R.ok(actTaskService.getTaskNodeList(processInstanceId));
+ }
}
--
Gitblit v1.9.3