From fd4c91301ea339ff477f2a1c66c068d6864171a5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 15 三月 2024 13:00:16 +0800
Subject: [PATCH] !496 工作流工具方法优化 Merge pull request !496 from 秋辞未寒/dev

---
 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java |   64 ++++++++++++++++++++++----------
 1 files changed, 44 insertions(+), 20 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 7bf61a7..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
@@ -8,18 +8,22 @@
 import org.dromara.common.idempotent.annotation.RepeatSubmit;
 import org.dromara.common.log.annotation.Log;
 import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
 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;
 
 /**
  * 浠诲姟绠＄悊 鎺у埗灞�
@@ -67,9 +71,9 @@
      *
      * @param taskBo 鍙傛暟
      */
-    @GetMapping("/getTaskWaitByPage")
-    public TableDataInfo<TaskVo> getTaskWaitByPage(TaskBo taskBo) {
-        return actTaskService.getTaskWaitByPage(taskBo);
+    @GetMapping("/getPageByTaskWait")
+    public TableDataInfo<TaskVo> getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery) {
+        return actTaskService.getPageByTaskWait(taskBo, pageQuery);
     }
 
     /**
@@ -77,9 +81,9 @@
      *
      * @param taskBo 鍙傛暟
      */
-    @GetMapping("/getAllTaskWaitByPage")
-    public TableDataInfo<TaskVo> getAllTaskWaitByPage(TaskBo taskBo) {
-        return actTaskService.getAllTaskWaitByPage(taskBo);
+    @GetMapping("/getPageByAllTaskWait")
+    public TableDataInfo<TaskVo> getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery) {
+        return actTaskService.getPageByAllTaskWait(taskBo, pageQuery);
     }
 
     /**
@@ -87,9 +91,9 @@
      *
      * @param taskBo 鍙傛暟
      */
-    @GetMapping("/getTaskFinishByPage")
-    public TableDataInfo<TaskVo> getTaskFinishByPage(TaskBo taskBo) {
-        return actTaskService.getTaskFinishByPage(taskBo);
+    @GetMapping("/getPageByTaskFinish")
+    public TableDataInfo<TaskVo> getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
+        return actTaskService.getPageByTaskFinish(taskBo, pageQuery);
     }
 
     /**
@@ -97,9 +101,9 @@
      *
      * @param taskBo 鍙傛暟
      */
-    @GetMapping("/getTaskCopyByPage")
-    public TableDataInfo<TaskVo> getTaskCopyByPage(TaskBo taskBo) {
-        return actTaskService.getTaskCopyByPage(taskBo);
+    @GetMapping("/getPageByTaskCopy")
+    public TableDataInfo<TaskVo> getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery) {
+        return actTaskService.getPageByTaskCopy(taskBo, pageQuery);
     }
 
     /**
@@ -107,9 +111,9 @@
      *
      * @param taskBo 鍙傛暟
      */
-    @GetMapping("/getAllTaskFinishByPage")
-    public TableDataInfo<TaskVo> getAllTaskFinishByPage(TaskBo taskBo) {
-        return actTaskService.getAllTaskFinishByPage(taskBo);
+    @GetMapping("/getPageByAllTaskFinish")
+    public TableDataInfo<TaskVo> getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
+        return actTaskService.getPageByAllTaskFinish(taskBo, pageQuery);
     }
 
     /**
@@ -221,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));
     }
 
 
@@ -243,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