From 11bfde3dc1f8fbb0bfd681e7ba35d491a4f52a06 Mon Sep 17 00:00:00 2001
From: AprilWind <2100166581@qq.com>
Date: 星期六, 25 五月 2024 22:39:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java
index cf97168..2fc0c1a 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java
@@ -5,6 +5,7 @@
import org.dromara.workflow.domain.bo.ProcessInstanceBo;
import org.dromara.workflow.domain.bo.ProcessInvalidBo;
import org.dromara.workflow.domain.bo.TaskUrgingBo;
+import org.dromara.workflow.domain.vo.ActHistoryInfoVo;
import org.dromara.workflow.domain.vo.ProcessInstanceVo;
import java.util.List;
@@ -36,6 +37,7 @@
* 鍒嗛〉鏌ヨ姝ｅ湪杩愯鐨勬祦绋嬪疄渚�
*
* @param processInstanceBo 鍙傛暟
+ * @param pageQuery 鍒嗛〉
* @return 缁撴灉
*/
TableDataInfo<ProcessInstanceVo> getPageByRunning(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);
@@ -44,6 +46,7 @@
* 鍒嗛〉鏌ヨ宸茬粨鏉熺殑娴佺▼瀹炰緥
*
* @param processInstanceBo 鍙傛暟
+ * @param pageQuery 鍒嗛〉
* @return 缁撴灉
*/
TableDataInfo<ProcessInstanceVo> getPageByFinish(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);
@@ -54,7 +57,7 @@
* @param processInstanceId 娴佺▼瀹炰緥id
* @return 缁撴灉
*/
- Map<String, Object> getHistoryRecord(String processInstanceId);
+ List<ActHistoryInfoVo> getHistoryRecord(String processInstanceId);
/**
* 浣滃簾娴佺▼瀹炰緥锛屼笉浼氬垹闄ゅ巻鍙茶褰�(鍒犻櫎杩愯涓殑瀹炰緥)
@@ -100,6 +103,7 @@
* 鍒嗛〉鏌ヨ褰撳墠鐧诲綍浜哄崟鎹�
*
* @param processInstanceBo 鍙傛暟
+ * @param pageQuery 鍒嗛〉
* @return 缁撴灉
*/
TableDataInfo<ProcessInstanceVo> getPageByCurrent(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);
--
Gitblit v1.9.3