From 22d87c7c9d6e35e2f7bc12da0a1eabfcb568108d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 07 三月 2024 14:09:30 +0800
Subject: [PATCH] update 优化 工作流代码与接口命名

---
 ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java |   19 ++++++++++---------
 1 files changed, 10 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..cf97168 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,7 +30,7 @@
      * @param processInstanceId 娴佺▼瀹炰緥id
      * @return 缁撴灉
      */
-    Map<String, Object> getHistoryProcessList(String processInstanceId);
+    Map<String, Object> getHistoryList(String processInstanceId);
 
     /**
      * 鍒嗛〉鏌ヨ姝e湪杩愯鐨勬祦绋嬪疄渚�
@@ -37,7 +38,7 @@
      * @param processInstanceBo 鍙傛暟
      * @return 缁撴灉
      */
-    TableDataInfo<ProcessInstanceVo> getProcessInstanceRunningByPage(ProcessInstanceBo processInstanceBo);
+    TableDataInfo<ProcessInstanceVo> getPageByRunning(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);
 
     /**
      * 鍒嗛〉鏌ヨ宸茬粨鏉熺殑娴佺▼瀹炰緥
@@ -45,7 +46,7 @@
      * @param processInstanceBo 鍙傛暟
      * @return 缁撴灉
      */
-    TableDataInfo<ProcessInstanceVo> getProcessInstanceFinishByPage(ProcessInstanceBo processInstanceBo);
+    TableDataInfo<ProcessInstanceVo> getPageByFinish(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);
 
     /**
      * 鑾峰彇瀹℃壒璁板綍
@@ -61,7 +62,7 @@
      * @param processInvalidBo 鍙傛暟
      * @return 缁撴灉
      */
-    boolean deleteRuntimeProcessInst(ProcessInvalidBo processInvalidBo);
+    boolean deleteRunInstance(ProcessInvalidBo processInvalidBo);
 
     /**
      * 杩愯涓殑瀹炰緥 鍒犻櫎绋嬪疄渚嬶紝鍒犻櫎鍘嗗彶璁板綍锛屽垹闄や笟鍔′笌娴佺▼鍏宠仈淇℃伅
@@ -69,7 +70,7 @@
      * @param processInstanceIds 娴佺▼瀹炰緥id
      * @return 缁撴灉
      */
-    boolean deleteRuntimeProcessAndHisInst(List<String> processInstanceIds);
+    boolean deleteRunAndHisInstance(List<String> processInstanceIds);
 
     /**
      * 鎸夌収涓氬姟id鍒犻櫎 杩愯涓殑瀹炰緥 鍒犻櫎绋嬪疄渚嬶紝鍒犻櫎鍘嗗彶璁板綍锛屽垹闄や笟鍔′笌娴佺▼鍏宠仈淇℃伅
@@ -77,7 +78,7 @@
      * @param businessKeys 涓氬姟id
      * @return 缁撴灉
      */
-    boolean deleteRuntimeProcessAndHisInstByBusinessKeys(List<String> businessKeys);
+    boolean deleteRunAndHisInstanceByBusinessKeys(List<String> businessKeys);
 
     /**
      * 宸插畬鎴愮殑瀹炰緥 鍒犻櫎绋嬪疄渚嬶紝鍒犻櫎鍘嗗彶璁板綍锛屽垹闄や笟鍔′笌娴佺▼鍏宠仈淇℃伅
@@ -85,7 +86,7 @@
      * @param processInstanceIds 娴佺▼瀹炰緥id
      * @return 缁撴灉
      */
-    boolean deleteFinishProcessAndHisInst(List<String> processInstanceIds);
+    boolean deleteFinishAndHisInstance(List<String> processInstanceIds);
 
     /**
      * 鎾ら攢娴佺▼鐢宠
@@ -101,7 +102,7 @@
      * @param processInstanceBo 鍙傛暟
      * @return 缁撴灉
      */
-    TableDataInfo<ProcessInstanceVo> getCurrentSubmitByPage(ProcessInstanceBo processInstanceBo);
+    TableDataInfo<ProcessInstanceVo> getPageByCurrent(ProcessInstanceBo processInstanceBo, PageQuery pageQuery);
 
     /**
      * 浠诲姟鍌姙(缁欏綋鍓嶄换鍔″姙鐞嗕汉鍙戦�佺珯鍐呬俊锛岄偖浠讹紝鐭俊绛�)

--
Gitblit v1.9.3