From 3c2c87364b89de46d12e95abd5bdf8cbd2c6dbf6 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 08:43:23 +0800
Subject: [PATCH] dev-init
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java | 45 +++++++++++++++++++++------------------------
1 files changed, 21 insertions(+), 24 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 c8af5a4..ca3b6fb 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
@@ -1,9 +1,11 @@
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.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;
@@ -18,42 +20,44 @@
/**
* 閫氳繃娴佺▼瀹炰緥id鑾峰彇鍘嗗彶娴佺▼鍥�
*
- * @param processInstanceId 娴佺▼瀹炰緥id
+ * @param businessKey 娴佺▼瀹炰緥id
* @return 缁撴灉
*/
- String getHistoryProcessImage(String processInstanceId);
+ String getHistoryImage(String businessKey);
/**
- * 閫氳繃娴佺▼瀹炰緥id鑾峰彇鍘嗗彶娴佺▼鍥捐繍琛屼腑锛屽巻鍙茬瓑鑺傜偣
+ * 閫氳繃涓氬姟id鑾峰彇鍘嗗彶娴佺▼鍥捐繍琛屼腑锛屽巻鍙茬瓑鑺傜偣
*
- * @param processInstanceId 娴佺▼瀹炰緥id
+ * @param businessKey 涓氬姟id
* @return 缁撴灉
*/
- Map<String, Object> getHistoryProcessList(String processInstanceId);
+ Map<String, Object> getHistoryList(String businessKey);
/**
* 鍒嗛〉鏌ヨ姝ｅ湪杩愯鐨勬祦绋嬪疄渚�
*
* @param processInstanceBo 鍙傛暟
+ * @param pageQuery 鍒嗛〉
* @return 缁撴灉
*/
- TableDataInfo<ProcessInstanceVo> getProcessInstanceRunningByPage(ProcessInstanceBo processInstanceBo);
+ TableDataInfo<ProcessInstanceVo> getPageByRunning(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);
/**
* 鍒嗛〉鏌ヨ宸茬粨鏉熺殑娴佺▼瀹炰緥
*
* @param processInstanceBo 鍙傛暟
+ * @param pageQuery 鍒嗛〉
* @return 缁撴灉
*/
- TableDataInfo<ProcessInstanceVo> getProcessInstanceFinishByPage(ProcessInstanceBo processInstanceBo);
+ TableDataInfo<ProcessInstanceVo> getPageByFinish(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);
/**
* 鑾峰彇瀹℃壒璁板綍
*
- * @param processInstanceId 娴佺▼瀹炰緥id
+ * @param businessKey 涓氬姟id
* @return 缁撴灉
*/
- Map<String, Object> getHistoryRecord(String processInstanceId);
+ List<ActHistoryInfoVo> getHistoryRecord(String businessKey);
/**
* 浣滃簾娴佺▼瀹炰緥锛屼笉浼氬垹闄ゅ巻鍙茶褰�(鍒犻櫎杩愯涓殑瀹炰緥)
@@ -61,47 +65,40 @@
* @param processInvalidBo 鍙傛暟
* @return 缁撴灉
*/
- boolean deleteRuntimeProcessInst(ProcessInvalidBo processInvalidBo);
+ boolean deleteRunInstance(ProcessInvalidBo processInvalidBo);
/**
* 杩愯涓殑瀹炰緥 鍒犻櫎绋嬪疄渚嬶紝鍒犻櫎鍘嗗彶璁板綍锛屽垹闄や笟鍔′笌娴佺▼鍏宠仈淇℃伅
*
- * @param processInstanceIds 娴佺▼瀹炰緥id
- * @return 缁撴灉
- */
- boolean deleteRuntimeProcessAndHisInst(List<String> processInstanceIds);
-
- /**
- * 鎸夌収涓氬姟id鍒犻櫎 杩愯涓殑瀹炰緥 鍒犻櫎绋嬪疄渚嬶紝鍒犻櫎鍘嗗彶璁板綍锛屽垹闄や笟鍔′笌娴佺▼鍏宠仈淇℃伅
- *
* @param businessKeys 涓氬姟id
* @return 缁撴灉
*/
- boolean deleteRuntimeProcessAndHisInstByBusinessKeys(List<String> businessKeys);
+ boolean deleteRunAndHisInstance(List<String> businessKeys);
/**
* 宸插畬鎴愮殑瀹炰緥 鍒犻櫎绋嬪疄渚嬶紝鍒犻櫎鍘嗗彶璁板綍锛屽垹闄や笟鍔′笌娴佺▼鍏宠仈淇℃伅
*
- * @param processInstanceIds 娴佺▼瀹炰緥id
+ * @param businessKeys 涓氬姟id
* @return 缁撴灉
*/
- boolean deleteFinishProcessAndHisInst(List<String> processInstanceIds);
+ boolean deleteFinishAndHisInstance(List<String> businessKeys);
/**
* 鎾ら攢娴佺▼鐢宠
*
- * @param processInstanceId 娴佺▼瀹炰緥id
+ * @param businessKey 涓氬姟id
* @return 缁撴灉
*/
- boolean cancelProcessApply(String processInstanceId);
+ boolean cancelProcessApply(String businessKey);
/**
* 鍒嗛〉鏌ヨ褰撳墠鐧诲綍浜哄崟鎹�
*
* @param processInstanceBo 鍙傛暟
+ * @param pageQuery 鍒嗛〉
* @return 缁撴灉
*/
- TableDataInfo<ProcessInstanceVo> getCurrentSubmitByPage(ProcessInstanceBo processInstanceBo);
+ TableDataInfo<ProcessInstanceVo> getPageByCurrent(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);
/**
* 浠诲姟鍌姙(缁欏綋鍓嶄换鍔″姙鐞嗕汉鍙戦�佺珯鍐呬俊锛岄偖浠讹紝鐭俊绛�)
--
Gitblit v1.9.3