From 22d87c7c9d6e35e2f7bc12da0a1eabfcb568108d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 07 三月 2024 14:09:30 +0800
Subject: [PATCH] update 优化 工作流代码与接口命名

---
 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 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..56c17a0 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,6 +8,7 @@
 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;
@@ -67,9 +68,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 +78,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 +88,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 +98,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 +108,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);
     }
 
     /**

--
Gitblit v1.9.3