From 1da98c8a8207dd062e433242e1567b6418c6ed81 Mon Sep 17 00:00:00 2001
From: gssong <1742057357@qq.com>
Date: 星期六, 06 四月 2024 11:20:29 +0800
Subject: [PATCH] update 优化表单绑定逻辑，移除流程定义配置表单
---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 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..3886804 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,5 +1,6 @@
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;
@@ -21,7 +22,7 @@
* @param processInstanceId 娴佺▼瀹炰緥id
* @return 缁撴灉
*/
- String getHistoryProcessImage(String processInstanceId);
+ String getHistoryImage(String processInstanceId);
/**
* 閫氳繃娴佺▼瀹炰緥id鑾峰彇鍘嗗彶娴佺▼鍥捐繍琛屼腑锛屽巻鍙茬瓑鑺傜偣
@@ -29,23 +30,25 @@
* @param processInstanceId 娴佺▼瀹炰緥id
* @return 缁撴灉
*/
- Map<String, Object> getHistoryProcessList(String processInstanceId);
+ Map<String, Object> getHistoryList(String processInstanceId);
/**
* 鍒嗛〉鏌ヨ姝ｅ湪杩愯鐨勬祦绋嬪疄渚�
*
* @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);
/**
* 鑾峰彇瀹℃壒璁板綍
@@ -61,7 +64,7 @@
* @param processInvalidBo 鍙傛暟
* @return 缁撴灉
*/
- boolean deleteRuntimeProcessInst(ProcessInvalidBo processInvalidBo);
+ boolean deleteRunInstance(ProcessInvalidBo processInvalidBo);
/**
* 杩愯涓殑瀹炰緥 鍒犻櫎绋嬪疄渚嬶紝鍒犻櫎鍘嗗彶璁板綍锛屽垹闄や笟鍔′笌娴佺▼鍏宠仈淇℃伅
@@ -69,7 +72,7 @@
* @param processInstanceIds 娴佺▼瀹炰緥id
* @return 缁撴灉
*/
- boolean deleteRuntimeProcessAndHisInst(List<String> processInstanceIds);
+ boolean deleteRunAndHisInstance(List<String> processInstanceIds);
/**
* 鎸夌収涓氬姟id鍒犻櫎 杩愯涓殑瀹炰緥 鍒犻櫎绋嬪疄渚嬶紝鍒犻櫎鍘嗗彶璁板綍锛屽垹闄や笟鍔′笌娴佺▼鍏宠仈淇℃伅
@@ -77,7 +80,7 @@
* @param businessKeys 涓氬姟id
* @return 缁撴灉
*/
- boolean deleteRuntimeProcessAndHisInstByBusinessKeys(List<String> businessKeys);
+ boolean deleteRunAndHisInstanceByBusinessKeys(List<String> businessKeys);
/**
* 宸插畬鎴愮殑瀹炰緥 鍒犻櫎绋嬪疄渚嬶紝鍒犻櫎鍘嗗彶璁板綍锛屽垹闄や笟鍔′笌娴佺▼鍏宠仈淇℃伅
@@ -85,7 +88,7 @@
* @param processInstanceIds 娴佺▼瀹炰緥id
* @return 缁撴灉
*/
- boolean deleteFinishProcessAndHisInst(List<String> processInstanceIds);
+ boolean deleteFinishAndHisInstance(List<String> processInstanceIds);
/**
* 鎾ら攢娴佺▼鐢宠
@@ -99,9 +102,10 @@
* 鍒嗛〉鏌ヨ褰撳墠鐧诲綍浜哄崟鎹�
*
* @param processInstanceBo 鍙傛暟
+ * @param pageQuery 鍒嗛〉
* @return 缁撴灉
*/
- TableDataInfo<ProcessInstanceVo> getCurrentSubmitByPage(ProcessInstanceBo processInstanceBo);
+ TableDataInfo<ProcessInstanceVo> getPageByCurrent(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);
/**
* 浠诲姟鍌姙(缁欏綋鍓嶄换鍔″姙鐞嗕汉鍙戦�佺珯鍐呬俊锛岄偖浠讹紝鐭俊绛�)
--
Gitblit v1.9.3