From 504333e56f249d16e71e8ac2a435cf2212040c23 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 27 五月 2025 17:32:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/IFlowTaskService.java | 33 +++++++++++++++++++++++++++------
1 files changed, 27 insertions(+), 6 deletions(-)
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/IFlowTaskService.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/IFlowTaskService.java
index 313777e..a79def8 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/IFlowTaskService.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/IFlowTaskService.java
@@ -1,8 +1,9 @@
package org.jeecg.modules.flowable.service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.flowable.task.api.Task;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.flowable.apithird.business.dto.FlowMyBusinessDto;
+import org.jeecg.modules.flowable.domain.dto.FlowNextDto;
import org.jeecg.modules.flowable.domain.dto.FlowViewerDto;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
@@ -19,6 +20,7 @@
* @param task 璇锋眰瀹炰綋鍙傛暟
*/
Result complete(FlowTaskVo task);
+
Result completeByDateId(FlowTaskVo flowTaskVo);
/**
* 椹冲洖浠诲姟
@@ -43,6 +45,14 @@
*/
Result findReturnTaskList(FlowTaskVo flowTaskVo);
Result findReturnTaskListByDataId(FlowTaskVo flowTaskVo);
+
+ /**
+ * 缁撴潫娴佺▼
+ * @param processInstanceId
+ * @param deleteReason
+ * @return
+ */
+ Result<?> end(String processInstanceId, String deleteReason);
/**
* 鍒犻櫎浠诲姟
@@ -112,6 +122,13 @@
*/
Result todoList(Integer pageNum, Integer pageSize);
+ /**
+ * 閫氳繃浼犲叆TaskIds鍒ゆ柇鏄惁鍦ㄥ悓涓�鑺傜偣
+ * @param taskIds
+ * @return
+ */
+ Result isSameNode(String taskIds);
+
/**
* 宸插姙浠诲姟鍒楄〃
@@ -120,12 +137,12 @@
* @param pageSize 姣忛〉鏉℃暟
* @return
*/
- Result finishedList(Integer pageNum, Integer pageSize);
+ Result finishedList(Integer pageNum, Integer pageSize,FlowMyBusinessDto flowMyBusinessDto);
/**
* 娴佺▼鍘嗗彶娴佽浆璁板綍
*
- * @param procInsId 娴佺▼瀹炰緥Id
+ * @param dataId 娴佺▼瀹炰緥Id
* @return
*/
Result flowRecord(String dataId);
@@ -164,9 +181,13 @@
* @param flowTaskVo 浠诲姟
* @return
*/
- Result getNextFlowNode(FlowTaskVo flowTaskVo);
+ Result<List<FlowNextDto>> getNextFlowNode(FlowTaskVo flowTaskVo);
-
-
+ /**
+ * 妫�鏌� 骞惰浠诲姟鑺傜偣鏄惁閮藉凡瀹屾垚
+ * @param currentTaskId
+ * @return
+ */
+ boolean checkParallelCompletion(String currentTaskId);
}
--
Gitblit v1.9.3