From dd219ad295b3cb0f61c161d1fc5a36fba364fcbb Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 03 四月 2024 11:13:59 +0800
Subject: [PATCH] !508 update 优化工作流ActTaskMapper.xml结果集定义 Merge pull request !508 from 秋辞未寒/dev_mpxml
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 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..45c3de2 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,12 @@
* @return 缁撴灉
*/
boolean updateAssignee(String[] taskIds, String userId);
+
+ /**
+ * 鏌ヨ娴佺▼鍙橀噺
+ *
+ * @param taskId 浠诲姟id
+ * @return 缁撴灉
+ */
+ List<VariableVo> getInstanceVariable(String taskId);
}
--
Gitblit v1.9.3