From 69e3afc7707d467b758858b52d3784947f7a502b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 五月 2024 10:25:23 +0800
Subject: [PATCH] !538 ♥️发布 5.2.0-BETA 公测版本 Merge pull request !538 from 疯狂的狮子Li/dev

---
 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java |   52 ++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java
index b5596a5..8e9f763 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java
@@ -1,9 +1,12 @@
 package org.dromara.workflow.service;
 
+import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.workflow.domain.bo.*;
 import org.dromara.workflow.domain.vo.TaskVo;
+import org.dromara.workflow.domain.vo.VariableVo;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -32,43 +35,48 @@
     /**
      * 鏌ヨ褰撳墠鐢ㄦ埛鐨勫緟鍔炰换鍔�
      *
-     * @param taskBo 鍙傛暟
+     * @param taskBo    鍙傛暟
+     * @param pageQuery 鍒嗛〉
      * @return 缁撴灉
      */
-    TableDataInfo<TaskVo> getTaskWaitByPage(TaskBo taskBo);
+    TableDataInfo<TaskVo> getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery);
 
     /**
      * 鏌ヨ褰撳墠绉熸埛鎵�鏈夊緟鍔炰换鍔�
      *
-     * @param taskBo 鍙傛暟
+     * @param taskBo    鍙傛暟
+     * @param pageQuery 鍒嗛〉
      * @return 缁撴灉
      */
-    TableDataInfo<TaskVo> getAllTaskWaitByPage(TaskBo taskBo);
+    TableDataInfo<TaskVo> getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery);
 
 
     /**
      * 鏌ヨ褰撳墠鐢ㄦ埛鐨勫凡鍔炰换鍔�
      *
-     * @param taskBo 鍙傛暟
+     * @param taskBo    鍙傛暟
+     * @param pageQuery 鍙傛暟
      * @return 缁撴灉
      */
-    TableDataInfo<TaskVo> getTaskFinishByPage(TaskBo taskBo);
+    TableDataInfo<TaskVo> getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery);
 
     /**
      * 鏌ヨ褰撳墠鐢ㄦ埛鐨勬妱閫�
      *
-     * @param taskBo 鍙傛暟
+     * @param taskBo    鍙傛暟
+     * @param pageQuery 鍙傛暟
      * @return 缁撴灉
      */
-    TableDataInfo<TaskVo> getTaskCopyByPage(TaskBo taskBo);
+    TableDataInfo<TaskVo> getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery);
 
     /**
      * 鏌ヨ褰撳墠绉熸埛鎵�鏈夊凡鍔炰换鍔�
      *
-     * @param taskBo 鍙傛暟
+     * @param taskBo    鍙傛暟
+     * @param pageQuery 鍙傛暟
      * @return 缁撴灉
      */
-    TableDataInfo<TaskVo> getAllTaskFinishByPage(TaskBo taskBo);
+    TableDataInfo<TaskVo> getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery);
 
     /**
      * 濮旀淳浠诲姟
@@ -126,4 +134,28 @@
      * @return 缁撴灉
      */
     boolean updateAssignee(String[] taskIds, String userId);
+
+    /**
+     * 鏌ヨ娴佺▼鍙橀噺
+     *
+     * @param taskId 浠诲姟id
+     * @return 缁撴灉
+     */
+    List<VariableVo> getInstanceVariable(String taskId);
+
+    /**
+     * 鏌ヨ宸ヤ綔娴佷换鍔＄敤鎴烽�夋嫨鍔犵浜哄憳
+     *
+     * @param taskId 浠诲姟id
+     * @return 缁撴灉
+     */
+    String getTaskUserIdsByAddMultiInstance(String taskId);
+
+    /**
+     * 鏌ヨ宸ヤ綔娴侀�夋嫨鍑忕浜哄憳
+     *
+     * @param taskId 浠诲姟id
+     * @return 缁撴灉
+     */
+    List<TaskVo> getListByDeleteMultiInstance(String taskId);
 }

--
Gitblit v1.9.3