From 90aad8ed9afd0096aa753cbea2f2a414bb3836b2 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期二, 23 四月 2024 10:21:58 +0800 Subject: [PATCH] !521 update 优化工作流模块 判断集合工具类,统一为CollUtil Merge pull request !521 from 追梦稻草人Li/dev --- ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java | 25 ++++++++++++++++++++----- 1 files changed, 20 insertions(+), 5 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 a90674b..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 @@ -4,7 +4,9 @@ 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; /** @@ -33,7 +35,8 @@ /** * 鏌ヨ褰撳墠鐢ㄦ埛鐨勫緟鍔炰换鍔� * - * @param taskBo 鍙傛暟 + * @param taskBo 鍙傛暟 + * @param pageQuery 鍒嗛〉 * @return 缁撴灉 */ TableDataInfo<TaskVo> getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery); @@ -41,7 +44,8 @@ /** * 鏌ヨ褰撳墠绉熸埛鎵�鏈夊緟鍔炰换鍔� * - * @param taskBo 鍙傛暟 + * @param taskBo 鍙傛暟 + * @param pageQuery 鍒嗛〉 * @return 缁撴灉 */ TableDataInfo<TaskVo> getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery); @@ -50,7 +54,8 @@ /** * 鏌ヨ褰撳墠鐢ㄦ埛鐨勫凡鍔炰换鍔� * - * @param taskBo 鍙傛暟 + * @param taskBo 鍙傛暟 + * @param pageQuery 鍙傛暟 * @return 缁撴灉 */ TableDataInfo<TaskVo> getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery); @@ -58,7 +63,8 @@ /** * 鏌ヨ褰撳墠鐢ㄦ埛鐨勬妱閫� * - * @param taskBo 鍙傛暟 + * @param taskBo 鍙傛暟 + * @param pageQuery 鍙傛暟 * @return 缁撴灉 */ TableDataInfo<TaskVo> getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery); @@ -66,7 +72,8 @@ /** * 鏌ヨ褰撳墠绉熸埛鎵�鏈夊凡鍔炰换鍔� * - * @param taskBo 鍙傛暟 + * @param taskBo 鍙傛暟 + * @param pageQuery 鍙傛暟 * @return 缁撴灉 */ TableDataInfo<TaskVo> getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery); @@ -127,4 +134,12 @@ * @return 缁撴灉 */ boolean updateAssignee(String[] taskIds, String userId); + + /** + * 鏌ヨ娴佺▼鍙橀噺 + * + * @param taskId 浠诲姟id + * @return 缁撴灉 + */ + List<VariableVo> getInstanceVariable(String taskId); } -- Gitblit v1.9.3