From 9f09083247ea96d01fd522aff30a2d0735d790bc Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期二, 12 三月 2024 21:33:39 +0800
Subject: [PATCH] fix 修复选择一人时还需要认领问题
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 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..72a5ea1 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,10 +1,14 @@
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;
+import java.util.Set;
/**
* 浠诲姟 鏈嶅姟灞�
@@ -32,43 +36,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 +135,20 @@
* @return 缁撴灉
*/
boolean updateAssignee(String[] taskIds, String userId);
+
+ /**
+ * 鏌ヨ娴佺▼鍙橀噺
+ *
+ * @param taskId 浠诲姟id
+ * @return 缁撴灉
+ */
+ List<VariableVo> getInstanceVariable(String taskId);
+
+ /**
+ * 鑾峰彇鍙┏鍥炲緱浠诲姟鑺傜偣
+ *
+ * @param processInstanceId 娴佺▼瀹炰緥id
+ * @return 缁撴灉
+ */
+ Set<TaskVo> getTaskNodeList(String processInstanceId);
}
--
Gitblit v1.9.3