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/impl/ActProcessInstanceServiceImpl.java | 89 +++++-----
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java | 55 +++---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java | 5
pom.xml | 2
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java | 3
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java | 9
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessInstanceService.java | 19 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowUserServiceImpl.java | 18 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java | 5
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java | 8
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java | 31 ++-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java | 37 ++--
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WorkflowUserController.java | 20 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWorkflowUserService.java | 6
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java | 22 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java | 11
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java | 3
/dev/null | 27 ---
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java | 5
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java | 5
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java | 13
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java | 5
ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java | 4
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java | 7
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java | 29 +-
ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java | 5
26 files changed, 214 insertions(+), 229 deletions(-)
diff --git a/pom.xml b/pom.xml
index ba9ced2..f8f6358 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
<spring-boot.version>3.2.3</spring-boot.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
- <java.version>17</java.version>
+ <java.version>21</java.version>
<spring-boot.mybatis>3.0.3</spring-boot.mybatis>
<springdoc.version>2.3.0</springdoc.version>
<therapi-javadoc.version>0.15.0</therapi-javadoc.version>
diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java
index 8ef4a57..40b7530 100644
--- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java
+++ b/ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/core/page/PageQuery.java
@@ -111,4 +111,8 @@
return list;
}
+ public Integer getFirstNum() {
+ return (pageNum - 1) * pageSize;
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/PageEntity.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/PageEntity.java
deleted file mode 100644
index cc8aadd..0000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/common/PageEntity.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.dromara.workflow.common;
-
-
-import lombok.Data;
-
-/**
- * 鍒嗛〉鍙傛暟
- *
- * @author may
- */
-@Data
-public class PageEntity {
-
- /**
- * 褰撳墠椤电爜
- */
- private Integer pageNum = 0;
-
- /**
- * 椤靛閲�
- */
- private Integer pageSize = 10;
-
- public Integer getPageNum() {
- return (pageNum - 1) * pageSize;
- }
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java
index 31e31e6..a5f2d7d 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActModelController.java
@@ -10,6 +10,7 @@
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.workflow.domain.bo.ModelBo;
@@ -45,8 +46,8 @@
* @param modelBo 妯″瀷鍙傛暟
*/
@GetMapping("/list")
- public TableDataInfo<Model> page(ModelBo modelBo) {
- return actModelService.page(modelBo);
+ public TableDataInfo<Model> page(ModelBo modelBo, PageQuery pageQuery) {
+ return actModelService.page(modelBo, pageQuery);
}
/**
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java
index fb04906..44b1bec 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessDefinitionController.java
@@ -7,6 +7,7 @@
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.workflow.domain.bo.ProcessDefinitionBo;
@@ -38,11 +39,11 @@
/**
* 鍒嗛〉鏌ヨ
*
- * @param processDefinitionBo 鍙傛暟
+ * @param bo 鍙傛暟
*/
@GetMapping("/list")
- public TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo processDefinitionBo) {
- return actProcessDefinitionService.page(processDefinitionBo);
+ public TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo bo, PageQuery pageQuery) {
+ return actProcessDefinitionService.page(bo, pageQuery);
}
/**
@@ -50,9 +51,9 @@
*
* @param key 娴佺▼瀹氫箟key
*/
- @GetMapping("/getProcessDefinitionListByKey/{key}")
- public R<List<ProcessDefinitionVo>> getProcessDefinitionListByKey(@NotEmpty(message = "娴佺▼瀹氫箟key涓嶈兘涓虹┖") @PathVariable String key) {
- return R.ok("鎿嶄綔鎴愬姛", actProcessDefinitionService.getProcessDefinitionListByKey(key));
+ @GetMapping("/getListByKey/{key}")
+ public R<List<ProcessDefinitionVo>> getListByKey(@NotEmpty(message = "娴佺▼瀹氫箟key涓嶈兘涓虹┖") @PathVariable String key) {
+ return R.ok("鎿嶄綔鎴愬姛", actProcessDefinitionService.getListByKey(key));
}
/**
@@ -60,9 +61,9 @@
*
* @param processDefinitionId 娴佺▼瀹氫箟id
*/
- @GetMapping("/processDefinitionImage/{processDefinitionId}")
- public R<String> processDefinitionImage(@PathVariable String processDefinitionId) {
- return R.ok("鎿嶄綔鎴愬姛", actProcessDefinitionService.processDefinitionImage(processDefinitionId));
+ @GetMapping("/definitionImage/{processDefinitionId}")
+ public R<String> definitionImage(@PathVariable String processDefinitionId) {
+ return R.ok("鎿嶄綔鎴愬姛", actProcessDefinitionService.definitionImage(processDefinitionId));
}
/**
@@ -70,10 +71,10 @@
*
* @param processDefinitionId 娴佺▼瀹氫箟id
*/
- @GetMapping("/processDefinitionXml/{processDefinitionId}")
- public R<Map<String, Object>> getXml(@NotBlank(message = "娴佺▼瀹氫箟id涓嶈兘涓虹┖") @PathVariable String processDefinitionId) {
+ @GetMapping("/definitionXml/{processDefinitionId}")
+ public R<Map<String, Object>> definitionXml(@NotBlank(message = "娴佺▼瀹氫箟id涓嶈兘涓虹┖") @PathVariable String processDefinitionId) {
Map<String, Object> map = new HashMap<>();
- String xmlStr = actProcessDefinitionService.processDefinitionXml(processDefinitionId);
+ String xmlStr = actProcessDefinitionService.definitionXml(processDefinitionId);
map.put("xml", Arrays.asList(xmlStr.split("\n")));
map.put("xmlStr", xmlStr);
return R.ok(map);
@@ -99,9 +100,9 @@
*/
@Log(title = "娴佺▼瀹氫箟绠＄悊", businessType = BusinessType.UPDATE)
@RepeatSubmit()
- @PutMapping("/updateProcessDefState/{processDefinitionId}")
- public R<Void> updateProcDefState(@NotBlank(message = "娴佺▼瀹氫箟id涓嶈兘涓虹┖") @PathVariable String processDefinitionId) {
- return toAjax(actProcessDefinitionService.updateProcessDefState(processDefinitionId));
+ @PutMapping("/updateDefinitionState/{processDefinitionId}")
+ public R<Void> updateDefinitionState(@NotBlank(message = "娴佺▼瀹氫箟id涓嶈兘涓虹┖") @PathVariable String processDefinitionId) {
+ return toAjax(actProcessDefinitionService.updateDefinitionState(processDefinitionId));
}
/**
@@ -112,10 +113,10 @@
*/
@Log(title = "娴佺▼瀹氫箟绠＄悊", businessType = BusinessType.UPDATE)
@RepeatSubmit()
- @PutMapping("/migrationProcessDefinition/{currentProcessDefinitionId}/{fromProcessDefinitionId}")
- public R<Void> migrationProcessDefinition(@NotBlank(message = "褰撳墠娴佺▼瀹氫箟id") @PathVariable String currentProcessDefinitionId,
+ @PutMapping("/migrationDefinition/{currentProcessDefinitionId}/{fromProcessDefinitionId}")
+ public R<Void> migrationDefinition(@NotBlank(message = "褰撳墠娴佺▼瀹氫箟id") @PathVariable String currentProcessDefinitionId,
@NotBlank(message = "闇�瑕佽縼绉诲埌鐨勬祦绋嬪畾涔塱d") @PathVariable String fromProcessDefinitionId) {
- return toAjax(actProcessDefinitionService.migrationProcessDefinition(currentProcessDefinitionId, fromProcessDefinitionId));
+ return toAjax(actProcessDefinitionService.migrationDefinition(currentProcessDefinitionId, fromProcessDefinitionId));
}
/**
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java
index cd2c9e2..4d433df 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActProcessInstanceController.java
@@ -8,6 +8,7 @@
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.web.core.BaseController;
import org.dromara.workflow.domain.bo.ProcessInstanceBo;
@@ -37,21 +38,21 @@
/**
* 鍒嗛〉鏌ヨ姝ｅ湪杩愯鐨勬祦绋嬪疄渚�
*
- * @param processInstanceBo 鍙傛暟
+ * @param bo 鍙傛暟
*/
- @GetMapping("/getProcessInstanceRunningByPage")
- public TableDataInfo<ProcessInstanceVo> getProcessInstanceRunningByPage(ProcessInstanceBo processInstanceBo) {
- return actProcessInstanceService.getProcessInstanceRunningByPage(processInstanceBo);
+ @GetMapping("/getPageByRunning")
+ public TableDataInfo<ProcessInstanceVo> getPageByRunning(ProcessInstanceBo bo, PageQuery pageQuery) {
+ return actProcessInstanceService.getPageByRunning(bo, pageQuery);
}
/**
* 鍒嗛〉鏌ヨ宸茬粨鏉熺殑娴佺▼瀹炰緥
*
- * @param processInstanceBo 鍙傛暟
+ * @param bo 鍙傛暟
*/
- @GetMapping("/getProcessInstanceFinishByPage")
- public TableDataInfo<ProcessInstanceVo> getProcessInstanceFinishByPage(ProcessInstanceBo processInstanceBo) {
- return actProcessInstanceService.getProcessInstanceFinishByPage(processInstanceBo);
+ @GetMapping("/getPageByFinish")
+ public TableDataInfo<ProcessInstanceVo> getPageByFinish(ProcessInstanceBo bo, PageQuery pageQuery) {
+ return actProcessInstanceService.getPageByFinish(bo, pageQuery);
}
/**
@@ -59,9 +60,9 @@
*
* @param processInstanceId 娴佺▼瀹炰緥id
*/
- @GetMapping("/getHistoryProcessImage/{processInstanceId}")
- public R<String> getHistoryProcessImage(@NotBlank(message = "娴佺▼瀹炰緥id涓嶈兘涓虹┖") @PathVariable String processInstanceId) {
- return R.ok("鎿嶄綔鎴愬姛", actProcessInstanceService.getHistoryProcessImage(processInstanceId));
+ @GetMapping("/getHistoryImage/{processInstanceId}")
+ public R<String> getHistoryImage(@NotBlank(message = "娴佺▼瀹炰緥id涓嶈兘涓虹┖") @PathVariable String processInstanceId) {
+ return R.ok("鎿嶄綔鎴愬姛", actProcessInstanceService.getHistoryImage(processInstanceId));
}
/**
@@ -69,9 +70,9 @@
*
* @param processInstanceId 娴佺▼瀹炰緥id
*/
- @GetMapping("/getHistoryProcessList/{processInstanceId}")
- public R<Map<String, Object>> getHistoryProcessList(@NotBlank(message = "娴佺▼瀹炰緥id涓嶈兘涓虹┖") @PathVariable String processInstanceId) {
- return R.ok("鎿嶄綔鎴愬姛", actProcessInstanceService.getHistoryProcessList(processInstanceId));
+ @GetMapping("/getHistoryList/{processInstanceId}")
+ public R<Map<String, Object>> getHistoryList(@NotBlank(message = "娴佺▼瀹炰緥id涓嶈兘涓虹┖") @PathVariable String processInstanceId) {
+ return R.ok("鎿嶄綔鎴愬姛", actProcessInstanceService.getHistoryList(processInstanceId));
}
/**
@@ -91,9 +92,9 @@
*/
@Log(title = "娴佺▼瀹炰緥绠＄悊", businessType = BusinessType.DELETE)
@RepeatSubmit()
- @PostMapping("/deleteRuntimeProcessInst")
- public R<Void> deleteRuntimeProcessInst(@Validated(AddGroup.class) @RequestBody ProcessInvalidBo processInvalidBo) {
- return toAjax(actProcessInstanceService.deleteRuntimeProcessInst(processInvalidBo));
+ @PostMapping("/deleteRunInstance")
+ public R<Void> deleteRunInstance(@Validated(AddGroup.class) @RequestBody ProcessInvalidBo processInvalidBo) {
+ return toAjax(actProcessInstanceService.deleteRunInstance(processInvalidBo));
}
/**
@@ -103,9 +104,9 @@
*/
@Log(title = "娴佺▼瀹炰緥绠＄悊", businessType = BusinessType.DELETE)
@RepeatSubmit()
- @DeleteMapping("/deleteRuntimeProcessAndHisInst/{processInstanceIds}")
- public R<Void> deleteRuntimeProcessAndHisInst(@NotNull(message = "娴佺▼瀹炰緥id涓嶈兘涓虹┖") @PathVariable String[] processInstanceIds) {
- return toAjax(actProcessInstanceService.deleteRuntimeProcessAndHisInst(Arrays.asList(processInstanceIds)));
+ @DeleteMapping("/deleteRunAndHisInstance/{processInstanceIds}")
+ public R<Void> deleteRunAndHisInstance(@NotNull(message = "娴佺▼瀹炰緥id涓嶈兘涓虹┖") @PathVariable String[] processInstanceIds) {
+ return toAjax(actProcessInstanceService.deleteRunAndHisInstance(Arrays.asList(processInstanceIds)));
}
/**
@@ -115,9 +116,9 @@
*/
@Log(title = "娴佺▼瀹炰緥绠＄悊", businessType = BusinessType.DELETE)
@RepeatSubmit()
- @DeleteMapping("/deleteFinishProcessAndHisInst/{processInstanceIds}")
- public R<Void> deleteFinishProcessAndHisInst(@NotNull(message = "娴佺▼瀹炰緥id涓嶈兘涓虹┖") @PathVariable String[] processInstanceIds) {
- return toAjax(actProcessInstanceService.deleteFinishProcessAndHisInst(Arrays.asList(processInstanceIds)));
+ @DeleteMapping("/deleteFinishAndHisInstance/{processInstanceIds}")
+ public R<Void> deleteFinishAndHisInstance(@NotNull(message = "娴佺▼瀹炰緥id涓嶈兘涓虹┖") @PathVariable String[] processInstanceIds) {
+ return toAjax(actProcessInstanceService.deleteFinishAndHisInstance(Arrays.asList(processInstanceIds)));
}
/**
@@ -135,11 +136,11 @@
/**
* 鍒嗛〉鏌ヨ褰撳墠鐧诲綍浜哄崟鎹�
*
- * @param processInstanceBo 鍙傛暟
+ * @param bo 鍙傛暟
*/
- @GetMapping("/getCurrentSubmitByPage")
- public TableDataInfo<ProcessInstanceVo> getCurrentSubmitByPage(ProcessInstanceBo processInstanceBo) {
- return actProcessInstanceService.getCurrentSubmitByPage(processInstanceBo);
+ @GetMapping("/getPageByCurrent")
+ public TableDataInfo<ProcessInstanceVo> getPageByCurrent(ProcessInstanceBo bo, PageQuery pageQuery) {
+ return actProcessInstanceService.getPageByCurrent(bo, pageQuery);
}
/**
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
index 7bf61a7..56c17a0 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/ActTaskController.java
@@ -8,6 +8,7 @@
import org.dromara.common.idempotent.annotation.RepeatSubmit;
import org.dromara.common.log.annotation.Log;
import org.dromara.common.log.enums.BusinessType;
+import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.web.core.BaseController;
@@ -67,9 +68,9 @@
*
* @param taskBo 鍙傛暟
*/
- @GetMapping("/getTaskWaitByPage")
- public TableDataInfo<TaskVo> getTaskWaitByPage(TaskBo taskBo) {
- return actTaskService.getTaskWaitByPage(taskBo);
+ @GetMapping("/getPageByTaskWait")
+ public TableDataInfo<TaskVo> getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery) {
+ return actTaskService.getPageByTaskWait(taskBo, pageQuery);
}
/**
@@ -77,9 +78,9 @@
*
* @param taskBo 鍙傛暟
*/
- @GetMapping("/getAllTaskWaitByPage")
- public TableDataInfo<TaskVo> getAllTaskWaitByPage(TaskBo taskBo) {
- return actTaskService.getAllTaskWaitByPage(taskBo);
+ @GetMapping("/getPageByAllTaskWait")
+ public TableDataInfo<TaskVo> getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery) {
+ return actTaskService.getPageByAllTaskWait(taskBo, pageQuery);
}
/**
@@ -87,9 +88,9 @@
*
* @param taskBo 鍙傛暟
*/
- @GetMapping("/getTaskFinishByPage")
- public TableDataInfo<TaskVo> getTaskFinishByPage(TaskBo taskBo) {
- return actTaskService.getTaskFinishByPage(taskBo);
+ @GetMapping("/getPageByTaskFinish")
+ public TableDataInfo<TaskVo> getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
+ return actTaskService.getPageByTaskFinish(taskBo, pageQuery);
}
/**
@@ -97,9 +98,9 @@
*
* @param taskBo 鍙傛暟
*/
- @GetMapping("/getTaskCopyByPage")
- public TableDataInfo<TaskVo> getTaskCopyByPage(TaskBo taskBo) {
- return actTaskService.getTaskCopyByPage(taskBo);
+ @GetMapping("/getPageByTaskCopy")
+ public TableDataInfo<TaskVo> getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery) {
+ return actTaskService.getPageByTaskCopy(taskBo, pageQuery);
}
/**
@@ -107,9 +108,9 @@
*
* @param taskBo 鍙傛暟
*/
- @GetMapping("/getAllTaskFinishByPage")
- public TableDataInfo<TaskVo> getAllTaskFinishByPage(TaskBo taskBo) {
- return actTaskService.getAllTaskFinishByPage(taskBo);
+ @GetMapping("/getPageByAllTaskFinish")
+ public TableDataInfo<TaskVo> getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
+ return actTaskService.getPageByAllTaskFinish(taskBo, pageQuery);
}
/**
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WorkflowUserController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WorkflowUserController.java
index 78f808f..d553ad8 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WorkflowUserController.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/WorkflowUserController.java
@@ -32,11 +32,11 @@
/**
* 鍒嗛〉鏌ヨ宸ヤ綔娴侀�夋嫨鍔犵浜哄憳
*
- * @param sysUserMultiBo 鍙傛暟
+ * @param bo 鍙傛暟
*/
- @GetMapping("/getWorkflowAddMultiListByPage")
- public TableDataInfo<SysUserVo> getWorkflowAddMultiInstanceByPage(SysUserMultiBo sysUserMultiBo) {
- return workflowUserService.getWorkflowAddMultiInstanceByPage(sysUserMultiBo);
+ @GetMapping("/getPageByAddMultiInstance")
+ public TableDataInfo<SysUserVo> getPageByAddMultiInstance(SysUserMultiBo bo, PageQuery pageQuery) {
+ return workflowUserService.getPageByAddMultiInstance(bo, pageQuery);
}
/**
@@ -44,9 +44,9 @@
*
* @param taskId 浠诲姟id
*/
- @GetMapping("/getWorkflowDeleteMultiInstanceList/{taskId}")
- public R<List<TaskVo>> getWorkflowDeleteMultiInstanceList(@PathVariable String taskId) {
- return R.ok(workflowUserService.getWorkflowDeleteMultiInstanceList(taskId));
+ @GetMapping("/getListByDeleteMultiInstance/{taskId}")
+ public R<List<TaskVo>> getListByDeleteMultiInstance(@PathVariable String taskId) {
+ return R.ok(workflowUserService.getListByDeleteMultiInstance(taskId));
}
/**
@@ -65,8 +65,8 @@
* @param sysUserBo 鍙傛暟
* @param pageQuery 鍒嗛〉
*/
- @GetMapping("/getUserListByPage")
- public TableDataInfo<SysUserVo> getUserListByPage(SysUserBo sysUserBo, PageQuery pageQuery) {
- return workflowUserService.getUserListByPage(sysUserBo, pageQuery);
+ @GetMapping("/getPageByUserList")
+ public TableDataInfo<SysUserVo> getPageByUserList(SysUserBo sysUserBo, PageQuery pageQuery) {
+ return workflowUserService.getPageByUserList(sysUserBo, pageQuery);
}
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java
index 12efd87..efe9acd 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ModelBo.java
@@ -3,10 +3,8 @@
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.Pattern;
import lombok.Data;
-import lombok.EqualsAndHashCode;
import org.dromara.common.core.validate.AddGroup;
import org.dromara.common.core.validate.EditGroup;
-import org.dromara.workflow.common.PageEntity;
import org.dromara.workflow.common.constant.FlowConstant;
import java.io.Serial;
@@ -18,8 +16,7 @@
* @author may
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class ModelBo extends PageEntity implements Serializable {
+public class ModelBo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java
index 86e9e01..2025932 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessDefinitionBo.java
@@ -1,8 +1,6 @@
package org.dromara.workflow.domain.bo;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.workflow.common.PageEntity;
import java.io.Serial;
import java.io.Serializable;
@@ -13,8 +11,7 @@
* @author may
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class ProcessDefinitionBo extends PageEntity implements Serializable {
+public class ProcessDefinitionBo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java
index ff8af23..2833b3e 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/ProcessInstanceBo.java
@@ -1,8 +1,6 @@
package org.dromara.workflow.domain.bo;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.workflow.common.PageEntity;
import java.io.Serial;
import java.io.Serializable;
@@ -13,8 +11,7 @@
* @author may
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class ProcessInstanceBo extends PageEntity implements Serializable {
+public class ProcessInstanceBo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java
index b54f481..e4d99e4 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/SysUserMultiBo.java
@@ -1,7 +1,9 @@
package org.dromara.workflow.domain.bo;
import lombok.Data;
-import org.dromara.workflow.common.PageEntity;
+
+import java.io.Serial;
+import java.io.Serializable;
/**
@@ -10,8 +12,11 @@
* @author may
*/
@Data
+public class SysUserMultiBo implements Serializable {
-public class SysUserMultiBo extends PageEntity {
+ @Serial
+ private static final long serialVersionUID = 1L;
+
/**
* 浜哄憳鍚嶇О
*/
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java
index cd2eead..3037479 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/bo/TaskBo.java
@@ -1,8 +1,6 @@
package org.dromara.workflow.domain.bo;
import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.dromara.workflow.common.PageEntity;
import java.io.Serial;
import java.io.Serializable;
@@ -13,8 +11,7 @@
* @author may
*/
@Data
-@EqualsAndHashCode(callSuper = true)
-public class TaskBo extends PageEntity implements Serializable {
+public class TaskBo implements Serializable {
@Serial
private static final long serialVersionUID = 1L;
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GroupRepresentation.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GroupRepresentation.java
deleted file mode 100644
index 53e4bfc..0000000
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/GroupRepresentation.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.dromara.workflow.domain.vo;
-
-import lombok.Data;
-
-/**
- * @author Joram Barrez
- */
-@Data
-public class GroupRepresentation {
-
- protected String id;
- protected String name;
- protected String type;
-
-}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java
index fad9d90..b8a230f 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/TaskVo.java
@@ -4,6 +4,8 @@
import org.dromara.common.translation.annotation.Translation;
import org.dromara.common.translation.constant.TransConstant;
+import java.io.Serial;
+import java.io.Serializable;
import java.util.Date;
/**
@@ -12,7 +14,10 @@
* @author may
*/
@Data
-public class TaskVo {
+public class TaskVo implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
/**
* 浠诲姟id
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java
index b1d41bb..88a5a21 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/domain/vo/WfCopy.java
@@ -2,13 +2,19 @@
import lombok.Data;
+import java.io.Serial;
+import java.io.Serializable;
+
/**
* 鎶勯��
*
* @author may
*/
@Data
-public class WfCopy {
+public class WfCopy implements Serializable {
+
+ @Serial
+ private static final long serialVersionUID = 1L;
/**
* 鐢ㄦ埛id
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java
index c7f6c18..bf5a423 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActModelService.java
@@ -1,6 +1,7 @@
package org.dromara.workflow.service;
import jakarta.servlet.http.HttpServletResponse;
+import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.workflow.domain.bo.ModelBo;
import org.dromara.workflow.domain.vo.ModelVo;
@@ -19,7 +20,7 @@
* @param modelBo 妯″瀷鍙傛暟
* @return 杩斿洖鍒嗛〉鍒楄〃
*/
- TableDataInfo<Model> page(ModelBo modelBo);
+ TableDataInfo<Model> page(ModelBo modelBo, PageQuery pageQuery);
/**
* 鏂板妯″瀷
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java
index 0fd94c8..9ae5b43 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActProcessDefinitionService.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.ProcessDefinitionBo;
import org.dromara.workflow.domain.vo.ProcessDefinitionVo;
@@ -19,7 +20,7 @@
* @param processDefinitionBo 鍙傛暟
* @return 杩斿洖鍒嗛〉鍒楄〃
*/
- TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo processDefinitionBo);
+ TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo processDefinitionBo, PageQuery pageQuery);
/**
* 鏌ヨ鍘嗗彶娴佺▼瀹氫箟鍒楄〃
@@ -27,7 +28,7 @@
* @param key 娴佺▼瀹氫箟key
* @return 缁撴灉
*/
- List<ProcessDefinitionVo> getProcessDefinitionListByKey(String key);
+ List<ProcessDefinitionVo> getListByKey(String key);
/**
* 鏌ョ湅娴佺▼瀹氫箟鍥剧墖
@@ -35,7 +36,7 @@
* @param processDefinitionId 娴佺▼瀹氫箟id
* @return 缁撴灉
*/
- String processDefinitionImage(String processDefinitionId);
+ String definitionImage(String processDefinitionId);
/**
* 鏌ョ湅娴佺▼瀹氫箟xml鏂囦欢
@@ -43,7 +44,7 @@
* @param processDefinitionId 娴佺▼瀹氫箟id
* @return 缁撴灉
*/
- String processDefinitionXml(String processDefinitionId);
+ String definitionXml(String processDefinitionId);
/**
* 鍒犻櫎娴佺▼瀹氫箟
@@ -60,7 +61,7 @@
* @param processDefinitionId 娴佺▼瀹氫箟id
* @return 缁撴灉
*/
- boolean updateProcessDefState(String processDefinitionId);
+ boolean updateDefinitionState(String processDefinitionId);
/**
* 杩佺Щ娴佺▼瀹氫箟
@@ -69,7 +70,7 @@
* @param fromProcessDefinitionId 闇�瑕佽縼绉诲埌鐨勬祦绋嬪畾涔塱d
* @return 缁撴灉
*/
- boolean migrationProcessDefinition(String currentProcessDefinitionId, String fromProcessDefinitionId);
+ boolean migrationDefinition(String currentProcessDefinitionId, String fromProcessDefinitionId);
/**
* 娴佺▼瀹氫箟杞崲涓烘ā鍨�
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);
/**
* 鍒嗛〉鏌ヨ姝ｅ湪杩愯鐨勬祦绋嬪疄渚�
@@ -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);
/**
* 浠诲姟鍌姙(缁欏綋鍓嶄换鍔″姙鐞嗕汉鍙戦�佺珯鍐呬俊锛岄偖浠讹紝鐭俊绛�)
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java
index b5596a5..a90674b 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IActTaskService.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.*;
import org.dromara.workflow.domain.vo.TaskVo;
@@ -35,7 +36,7 @@
* @param taskBo 鍙傛暟
* @return 缁撴灉
*/
- TableDataInfo<TaskVo> getTaskWaitByPage(TaskBo taskBo);
+ TableDataInfo<TaskVo> getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery);
/**
* 鏌ヨ褰撳墠绉熸埛鎵�鏈夊緟鍔炰换鍔�
@@ -43,7 +44,7 @@
* @param taskBo 鍙傛暟
* @return 缁撴灉
*/
- TableDataInfo<TaskVo> getAllTaskWaitByPage(TaskBo taskBo);
+ TableDataInfo<TaskVo> getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery);
/**
@@ -52,7 +53,7 @@
* @param taskBo 鍙傛暟
* @return 缁撴灉
*/
- TableDataInfo<TaskVo> getTaskFinishByPage(TaskBo taskBo);
+ TableDataInfo<TaskVo> getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery);
/**
* 鏌ヨ褰撳墠鐢ㄦ埛鐨勬妱閫�
@@ -60,7 +61,7 @@
* @param taskBo 鍙傛暟
* @return 缁撴灉
*/
- TableDataInfo<TaskVo> getTaskCopyByPage(TaskBo taskBo);
+ TableDataInfo<TaskVo> getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery);
/**
* 鏌ヨ褰撳墠绉熸埛鎵�鏈夊凡鍔炰换鍔�
@@ -68,7 +69,7 @@
* @param taskBo 鍙傛暟
* @return 缁撴灉
*/
- TableDataInfo<TaskVo> getAllTaskFinishByPage(TaskBo taskBo);
+ TableDataInfo<TaskVo> getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery);
/**
* 濮旀淳浠诲姟
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWorkflowUserService.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWorkflowUserService.java
index 3c91572..c7f178e 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWorkflowUserService.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/IWorkflowUserService.java
@@ -23,7 +23,7 @@
* @param sysUserMultiBo 鍙傛暟
* @return 缁撴灉
*/
- TableDataInfo<SysUserVo> getWorkflowAddMultiInstanceByPage(SysUserMultiBo sysUserMultiBo);
+ TableDataInfo<SysUserVo> getPageByAddMultiInstance(SysUserMultiBo sysUserMultiBo, PageQuery pageQuery);
/**
* 鏌ヨ宸ヤ綔娴侀�夋嫨鍑忕浜哄憳
@@ -31,7 +31,7 @@
* @param taskId 浠诲姟id
* @return 缁撴灉
*/
- List<TaskVo> getWorkflowDeleteMultiInstanceList(String taskId);
+ List<TaskVo> getListByDeleteMultiInstance(String taskId);
/**
* 鎸夌収鐢ㄦ埛id鏌ヨ鐢ㄦ埛
@@ -56,5 +56,5 @@
* @param pageQuery 鍒嗛〉
* @return 缁撴灉
*/
- TableDataInfo<SysUserVo> getUserListByPage(SysUserBo sysUserBo, PageQuery pageQuery);
+ TableDataInfo<SysUserVo> getPageByUserList(SysUserBo sysUserBo, PageQuery pageQuery);
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
index 4d23bf0..93934c9 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActModelServiceImpl.java
@@ -15,6 +15,7 @@
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
import org.dromara.common.core.exception.ServiceException;
+import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.workflow.common.constant.FlowConstant;
@@ -59,7 +60,7 @@
* @return 杩斿洖鍒嗛〉鍒楄〃
*/
@Override
- public TableDataInfo<Model> page(ModelBo modelBo) {
+ public TableDataInfo<Model> page(ModelBo modelBo, PageQuery pageQuery) {
ModelQuery query = QueryUtils.modelQuery();
if (StringUtils.isNotEmpty(modelBo.getName())) {
query.modelNameLike("%" + modelBo.getName() + "%");
@@ -74,7 +75,7 @@
// 鍒涘缓鏃堕棿闄嶅簭鎺掑垪
query.orderByCreateTime().desc();
// 鍒嗛〉鏌ヨ
- List<Model> modelList = query.listPage(modelBo.getPageNum(), modelBo.getPageSize());
+ List<Model> modelList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
// 鎬昏褰曟暟
long total = query.count();
return new TableDataInfo<>(modelList, total);
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
index 51c90f1..a06fb34 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessDefinitionServiceImpl.java
@@ -12,6 +12,7 @@
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.workflow.common.constant.FlowConstant;
@@ -53,25 +54,25 @@
/**
* 鍒嗛〉鏌ヨ
*
- * @param processDefinitionBo 鍙傛暟
+ * @param bo 鍙傛暟
* @return 杩斿洖鍒嗛〉鍒楄〃
*/
@Override
- public TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo processDefinitionBo) {
+ public TableDataInfo<ProcessDefinitionVo> page(ProcessDefinitionBo bo, PageQuery pageQuery) {
ProcessDefinitionQuery query = QueryUtils.definitionQuery();
- if (StringUtils.isNotEmpty(processDefinitionBo.getKey())) {
- query.processDefinitionKey(processDefinitionBo.getKey());
+ if (StringUtils.isNotEmpty(bo.getKey())) {
+ query.processDefinitionKey(bo.getKey());
}
- if (StringUtils.isNotEmpty(processDefinitionBo.getCategoryCode())) {
- query.processDefinitionCategory(processDefinitionBo.getCategoryCode());
+ if (StringUtils.isNotEmpty(bo.getCategoryCode())) {
+ query.processDefinitionCategory(bo.getCategoryCode());
}
- if (StringUtils.isNotEmpty(processDefinitionBo.getName())) {
- query.processDefinitionNameLike("%" + processDefinitionBo.getName() + "%");
+ if (StringUtils.isNotEmpty(bo.getName())) {
+ query.processDefinitionNameLike("%" + bo.getName() + "%");
}
query.orderByDeploymentId().desc();
// 鍒嗛〉鏌ヨ
List<ProcessDefinitionVo> processDefinitionVoList = new ArrayList<>();
- List<ProcessDefinition> definitionList = query.latestVersion().listPage(processDefinitionBo.getPageNum(), processDefinitionBo.getPageSize());
+ List<ProcessDefinition> definitionList = query.latestVersion().listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
List<Deployment> deploymentList = null;
if (CollUtil.isNotEmpty(definitionList)) {
List<String> deploymentIds = StreamUtils.toList(definitionList, ProcessDefinition::getDeploymentId);
@@ -99,7 +100,7 @@
* @param key 娴佺▼瀹氫箟key
*/
@Override
- public List<ProcessDefinitionVo> getProcessDefinitionListByKey(String key) {
+ public List<ProcessDefinitionVo> getListByKey(String key) {
List<ProcessDefinitionVo> processDefinitionVoList = new ArrayList<>();
ProcessDefinitionQuery query = QueryUtils.definitionQuery();
List<ProcessDefinition> definitionList = query.processDefinitionKey(key).list();
@@ -128,7 +129,7 @@
*/
@SneakyThrows
@Override
- public String processDefinitionImage(String processDefinitionId) {
+ public String definitionImage(String processDefinitionId) {
InputStream inputStream = repositoryService.getProcessDiagram(processDefinitionId);
return Base64.encode(IOUtils.toByteArray(inputStream));
}
@@ -139,7 +140,7 @@
* @param processDefinitionId 娴佺▼瀹氫箟id
*/
@Override
- public String processDefinitionXml(String processDefinitionId) {
+ public String definitionXml(String processDefinitionId) {
StringBuilder xml = new StringBuilder();
ProcessDefinition processDefinition = repositoryService.getProcessDefinition(processDefinitionId);
InputStream inputStream;
@@ -181,7 +182,7 @@
* @param processDefinitionId 娴佺▼瀹氫箟id
*/
@Override
- public boolean updateProcessDefState(String processDefinitionId) {
+ public boolean updateDefinitionState(String processDefinitionId) {
try {
ProcessDefinition processDefinition = QueryUtils.definitionQuery()
.processDefinitionId(processDefinitionId).singleResult();
@@ -208,7 +209,7 @@
*/
@Override
- public boolean migrationProcessDefinition(String currentProcessDefinitionId, String fromProcessDefinitionId) {
+ public boolean migrationDefinition(String currentProcessDefinitionId, String fromProcessDefinitionId) {
try {
// 杩佺Щ楠岃瘉
boolean migrationValid = processMigrationService.createProcessInstanceMigrationBuilder()
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
index 0b18e9f..daf40ec 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActProcessInstanceServiceImpl.java
@@ -11,6 +11,7 @@
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.StreamUtils;
import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.workflow.common.constant.FlowConstant;
@@ -90,29 +91,29 @@
/**
* 鍒嗛〉鏌ヨ姝ｅ湪杩愯鐨勬祦绋嬪疄渚�
*
- * @param processInstanceBo 鍙傛暟
+ * @param bo 鍙傛暟
*/
@Override
- public TableDataInfo<ProcessInstanceVo> getProcessInstanceRunningByPage(ProcessInstanceBo processInstanceBo) {
+ public TableDataInfo<ProcessInstanceVo> getPageByRunning(ProcessInstanceBo bo, PageQuery pageQuery) {
List<ProcessInstanceVo> list = new ArrayList<>();
ProcessInstanceQuery query = QueryUtils.instanceQuery();
- if (StringUtils.isNotBlank(processInstanceBo.getName())) {
- query.processInstanceNameLikeIgnoreCase("%" + processInstanceBo.getName() + "%");
+ if (StringUtils.isNotBlank(bo.getName())) {
+ query.processInstanceNameLikeIgnoreCase("%" + bo.getName() + "%");
}
- if (StringUtils.isNotBlank(processInstanceBo.getKey())) {
- query.processDefinitionKey(processInstanceBo.getKey());
+ if (StringUtils.isNotBlank(bo.getKey())) {
+ query.processDefinitionKey(bo.getKey());
}
- if (StringUtils.isNotBlank(processInstanceBo.getStartUserId())) {
- query.startedBy(processInstanceBo.getStartUserId());
+ if (StringUtils.isNotBlank(bo.getStartUserId())) {
+ query.startedBy(bo.getStartUserId());
}
- if (StringUtils.isNotBlank(processInstanceBo.getBusinessKey())) {
- query.processInstanceBusinessKey(processInstanceBo.getBusinessKey());
+ if (StringUtils.isNotBlank(bo.getBusinessKey())) {
+ query.processInstanceBusinessKey(bo.getBusinessKey());
}
- if (StringUtils.isNotBlank(processInstanceBo.getCategoryCode())) {
- query.processDefinitionCategory(processInstanceBo.getCategoryCode());
+ if (StringUtils.isNotBlank(bo.getCategoryCode())) {
+ query.processDefinitionCategory(bo.getCategoryCode());
}
query.orderByStartTime().desc();
- List<ProcessInstance> processInstances = query.listPage(processInstanceBo.getPageNum(), processInstanceBo.getPageSize());
+ List<ProcessInstance> processInstances = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
for (ProcessInstance processInstance : processInstances) {
ProcessInstanceVo processInstanceVo = BeanUtil.toBean(processInstance, ProcessInstanceVo.class);
processInstanceVo.setIsSuspended(processInstance.isSuspended());
@@ -126,29 +127,29 @@
/**
* 鍒嗛〉鏌ヨ宸茬粨鏉熺殑娴佺▼瀹炰緥
*
- * @param processInstanceBo 鍙傛暟
+ * @param bo 鍙傛暟
*/
@Override
- public TableDataInfo<ProcessInstanceVo> getProcessInstanceFinishByPage(ProcessInstanceBo processInstanceBo) {
+ public TableDataInfo<ProcessInstanceVo> getPageByFinish(ProcessInstanceBo bo, PageQuery pageQuery) {
List<ProcessInstanceVo> list = new ArrayList<>();
HistoricProcessInstanceQuery query = QueryUtils.hisInstanceQuery()
.finished().orderByProcessInstanceEndTime().desc();
- if (StringUtils.isNotEmpty(processInstanceBo.getName())) {
- query.processInstanceNameLikeIgnoreCase("%" + processInstanceBo.getName() + "%");
+ if (StringUtils.isNotEmpty(bo.getName())) {
+ query.processInstanceNameLikeIgnoreCase("%" + bo.getName() + "%");
}
- if (StringUtils.isNotBlank(processInstanceBo.getKey())) {
- query.processDefinitionKey(processInstanceBo.getKey());
+ if (StringUtils.isNotBlank(bo.getKey())) {
+ query.processDefinitionKey(bo.getKey());
}
- if (StringUtils.isNotEmpty(processInstanceBo.getStartUserId())) {
- query.startedBy(processInstanceBo.getStartUserId());
+ if (StringUtils.isNotEmpty(bo.getStartUserId())) {
+ query.startedBy(bo.getStartUserId());
}
- if (StringUtils.isNotBlank(processInstanceBo.getBusinessKey())) {
- query.processInstanceBusinessKey(processInstanceBo.getBusinessKey());
+ if (StringUtils.isNotBlank(bo.getBusinessKey())) {
+ query.processInstanceBusinessKey(bo.getBusinessKey());
}
- if (StringUtils.isNotBlank(processInstanceBo.getCategoryCode())) {
- query.processDefinitionCategory(processInstanceBo.getCategoryCode());
+ if (StringUtils.isNotBlank(bo.getCategoryCode())) {
+ query.processDefinitionCategory(bo.getCategoryCode());
}
- List<HistoricProcessInstance> historicProcessInstances = query.listPage(processInstanceBo.getPageNum(), processInstanceBo.getPageSize());
+ List<HistoricProcessInstance> historicProcessInstances = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {
ProcessInstanceVo processInstanceVo = BeanUtil.toBean(historicProcessInstance, ProcessInstanceVo.class);
processInstanceVo.setBusinessStatusName(BusinessStatusEnum.findByStatus(historicProcessInstance.getBusinessStatus()));
@@ -165,7 +166,7 @@
*/
@SneakyThrows
@Override
- public String getHistoryProcessImage(String processInstanceId) {
+ public String getHistoryImage(String processInstanceId) {
String processDefinitionId;
// 鑾峰彇褰撳墠鐨勬祦绋嬪疄渚�
ProcessInstance processInstance = QueryUtils.instanceQuery(processInstanceId).singleResult();
@@ -220,7 +221,7 @@
* @param processInstanceId 娴佺▼瀹炰緥id
*/
@Override
- public Map<String, Object> getHistoryProcessList(String processInstanceId) {
+ public Map<String, Object> getHistoryList(String processInstanceId) {
Map<String, Object> map = new HashMap<>();
List<Map<String, Object>> taskList = new ArrayList<>();
HistoricProcessInstance historicProcessInstance = QueryUtils.hisInstanceQuery(processInstanceId).singleResult();
@@ -449,7 +450,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean deleteRuntimeProcessInst(ProcessInvalidBo processInvalidBo) {
+ public boolean deleteRunInstance(ProcessInvalidBo processInvalidBo) {
try {
List<Task> list = QueryUtils.taskQuery(processInvalidBo.getProcessInstanceId()).list();
List<Task> subTasks = StreamUtils.filter(list, e -> StringUtils.isNotBlank(e.getParentTaskId()));
@@ -487,7 +488,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean deleteRuntimeProcessAndHisInst(List<String> processInstanceIds) {
+ public boolean deleteRunAndHisInstance(List<String> processInstanceIds) {
try {
// 1.鍒犻櫎杩愯涓祦绋嬪疄渚�
List<Task> list = QueryUtils.taskQuery(processInstanceIds).list();
@@ -515,7 +516,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean deleteRuntimeProcessAndHisInstByBusinessKeys(List<String> businessKeys) {
+ public boolean deleteRunAndHisInstanceByBusinessKeys(List<String> businessKeys) {
try {
// 1.鍒犻櫎杩愯涓祦绋嬪疄渚�
List<ActHiProcinst> actHiProcinsts = actHiProcinstService.selectByBusinessKeyIn(businessKeys);
@@ -549,7 +550,7 @@
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public boolean deleteFinishProcessAndHisInst(List<String> processInstanceIds) {
+ public boolean deleteFinishAndHisInstance(List<String> processInstanceIds) {
try {
historyService.bulkDeleteHistoricProcessInstances(processInstanceIds);
return true;
@@ -614,27 +615,27 @@
/**
* 鍒嗛〉鏌ヨ褰撳墠鐧诲綍浜哄崟鎹�
*
- * @param processInstanceBo 鍙傛暟
+ * @param bo 鍙傛暟
*/
@Override
- public TableDataInfo<ProcessInstanceVo> getCurrentSubmitByPage(ProcessInstanceBo processInstanceBo) {
+ public TableDataInfo<ProcessInstanceVo> getPageByCurrent(ProcessInstanceBo bo, PageQuery pageQuery) {
List<ProcessInstanceVo> list = new ArrayList<>();
HistoricProcessInstanceQuery query = QueryUtils.hisInstanceQuery();
- query.startedBy(processInstanceBo.getStartUserId());
- if (StringUtils.isNotBlank(processInstanceBo.getName())) {
- query.processInstanceNameLikeIgnoreCase("%" + processInstanceBo.getName() + "%");
+ query.startedBy(bo.getStartUserId());
+ if (StringUtils.isNotBlank(bo.getName())) {
+ query.processInstanceNameLikeIgnoreCase("%" + bo.getName() + "%");
}
- if (StringUtils.isNotBlank(processInstanceBo.getKey())) {
- query.processDefinitionKey(processInstanceBo.getKey());
+ if (StringUtils.isNotBlank(bo.getKey())) {
+ query.processDefinitionKey(bo.getKey());
}
- if (StringUtils.isNotBlank(processInstanceBo.getBusinessKey())) {
- query.processInstanceBusinessKey(processInstanceBo.getBusinessKey());
+ if (StringUtils.isNotBlank(bo.getBusinessKey())) {
+ query.processInstanceBusinessKey(bo.getBusinessKey());
}
- if (StringUtils.isNotBlank(processInstanceBo.getCategoryCode())) {
- query.processDefinitionCategory(processInstanceBo.getCategoryCode());
+ if (StringUtils.isNotBlank(bo.getCategoryCode())) {
+ query.processDefinitionCategory(bo.getCategoryCode());
}
query.orderByProcessInstanceStartTime().desc();
- List<HistoricProcessInstance> historicProcessInstanceList = query.listPage(processInstanceBo.getPageNum(), processInstanceBo.getPageSize());
+ List<HistoricProcessInstance> historicProcessInstanceList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
List<TaskVo> taskVoList = new ArrayList<>();
if (CollUtil.isNotEmpty(historicProcessInstanceList)) {
List<String> processInstanceIds = StreamUtils.toList(historicProcessInstanceList, HistoricProcessInstance::getId);
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
index 440d43c..968ca91 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/ActTaskServiceImpl.java
@@ -236,10 +236,7 @@
* @param taskBo 鍙傛暟
*/
@Override
- public TableDataInfo<TaskVo> getTaskWaitByPage(TaskBo taskBo) {
- PageQuery pageQuery = new PageQuery();
- pageQuery.setPageNum(taskBo.getPageNum());
- pageQuery.setPageSize(taskBo.getPageSize());
+ public TableDataInfo<TaskVo> getPageByTaskWait(TaskBo taskBo, PageQuery pageQuery) {
QueryWrapper<TaskVo> queryWrapper = new QueryWrapper<>();
List<RoleDTO> roles = LoginHelper.getLoginUser().getRoles();
String userId = String.valueOf(LoginHelper.getUserId());
@@ -276,7 +273,7 @@
* @param taskBo 鍙傛暟
*/
@Override
- public TableDataInfo<TaskVo> getAllTaskWaitByPage(TaskBo taskBo) {
+ public TableDataInfo<TaskVo> getPageByAllTaskWait(TaskBo taskBo, PageQuery pageQuery) {
TaskQuery query = QueryUtils.taskQuery();
if (StringUtils.isNotBlank(taskBo.getName())) {
query.taskNameLike("%" + taskBo.getName() + "%");
@@ -288,7 +285,7 @@
query.processDefinitionKey(taskBo.getProcessDefinitionKey());
}
query.orderByTaskCreateTime().desc();
- List<Task> taskList = query.listPage(taskBo.getPageNum(), taskBo.getPageSize());
+ List<Task> taskList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
List<ProcessInstance> processInstanceList = null;
if (CollUtil.isNotEmpty(taskList)) {
Set<String> processInstanceIds = StreamUtils.toSet(taskList, Task::getProcessInstanceId);
@@ -320,7 +317,7 @@
* @param taskBo 鍙傛暟
*/
@Override
- public TableDataInfo<TaskVo> getTaskFinishByPage(TaskBo taskBo) {
+ public TableDataInfo<TaskVo> getPageByTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
String userId = String.valueOf(LoginHelper.getUserId());
HistoricTaskInstanceQuery query = QueryUtils.hisTaskInstanceQuery();
query.taskAssignee(userId).finished().orderByHistoricTaskInstanceStartTime().desc();
@@ -333,7 +330,7 @@
if (StringUtils.isNotBlank(taskBo.getProcessDefinitionKey())) {
query.processDefinitionKey(taskBo.getProcessDefinitionKey());
}
- List<HistoricTaskInstance> taskInstanceList = query.listPage(taskBo.getPageNum(), taskBo.getPageSize());
+ List<HistoricTaskInstance> taskInstanceList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
List<HistoricProcessInstance> historicProcessInstanceList = null;
if (CollUtil.isNotEmpty(taskInstanceList)) {
Set<String> processInstanceIds = StreamUtils.toSet(taskInstanceList, HistoricTaskInstance::getProcessInstanceId);
@@ -363,10 +360,7 @@
* @param taskBo 鍙傛暟
*/
@Override
- public TableDataInfo<TaskVo> getTaskCopyByPage(TaskBo taskBo) {
- PageQuery pageQuery = new PageQuery();
- pageQuery.setPageNum(taskBo.getPageNum());
- pageQuery.setPageSize(taskBo.getPageSize());
+ public TableDataInfo<TaskVo> getPageByTaskCopy(TaskBo taskBo, PageQuery pageQuery) {
QueryWrapper<TaskVo> queryWrapper = new QueryWrapper<>();
String userId = String.valueOf(LoginHelper.getUserId());
if (StringUtils.isNotBlank(taskBo.getName())) {
@@ -395,7 +389,7 @@
* @param taskBo 鍙傛暟
*/
@Override
- public TableDataInfo<TaskVo> getAllTaskFinishByPage(TaskBo taskBo) {
+ public TableDataInfo<TaskVo> getPageByAllTaskFinish(TaskBo taskBo, PageQuery pageQuery) {
HistoricTaskInstanceQuery query = QueryUtils.hisTaskInstanceQuery();
query.finished().orderByHistoricTaskInstanceStartTime().desc();
if (StringUtils.isNotBlank(taskBo.getName())) {
@@ -407,7 +401,7 @@
if (StringUtils.isNotBlank(taskBo.getProcessDefinitionKey())) {
query.processDefinitionKey(taskBo.getProcessDefinitionKey());
}
- List<HistoricTaskInstance> taskInstanceList = query.listPage(taskBo.getPageNum(), taskBo.getPageSize());
+ List<HistoricTaskInstance> taskInstanceList = query.listPage(pageQuery.getFirstNum(), pageQuery.getPageSize());
List<HistoricProcessInstance> historicProcessInstanceList = null;
if (CollUtil.isNotEmpty(taskInstanceList)) {
Set<String> processInstanceIds = StreamUtils.toSet(taskInstanceList, HistoricTaskInstance::getProcessInstanceId);
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
index 7b55ee5..1d48d25 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/TestLeaveServiceImpl.java
@@ -23,7 +23,6 @@
import java.util.Collection;
import java.util.List;
-import java.util.Map;
/**
* 璇峰亣Service涓氬姟灞傚鐞�
@@ -118,7 +117,7 @@
@Transactional(rollbackFor = Exception.class)
public Boolean deleteWithValidByIds(Collection<Long> ids) {
List<String> idList = StreamUtils.toList(ids, String::valueOf);
- iActProcessInstanceService.deleteRuntimeProcessAndHisInstByBusinessKeys(idList);
+ iActProcessInstanceService.deleteRunAndHisInstanceByBusinessKeys(idList);
return baseMapper.deleteBatchIds(ids) > 0;
}
}
diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowUserServiceImpl.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowUserServiceImpl.java
index 93f7f25..2bc444f 100644
--- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowUserServiceImpl.java
+++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/service/impl/WorkflowUserServiceImpl.java
@@ -50,12 +50,12 @@
/**
* 鍒嗛〉鏌ヨ宸ヤ綔娴侀�夋嫨鍔犵浜哄憳
*
- * @param sysUserMultiBo 鍙傛暟
+ * @param bo 鍙傛暟
*/
@Override
@SuppressWarnings("unchecked")
- public TableDataInfo<SysUserVo> getWorkflowAddMultiInstanceByPage(SysUserMultiBo sysUserMultiBo) {
- Task task = QueryUtils.taskQuery().taskId(sysUserMultiBo.getTaskId()).singleResult();
+ public TableDataInfo<SysUserVo> getPageByAddMultiInstance(SysUserMultiBo bo, PageQuery pageQuery) {
+ Task task = QueryUtils.taskQuery().taskId(bo.getTaskId()).singleResult();
if (task == null) {
throw new ServiceException("浠诲姟涓嶅瓨鍦�");
}
@@ -65,7 +65,7 @@
}
LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery();
//妫�绱㈡潯浠�
- queryWrapper.eq(StringUtils.isNotEmpty(sysUserMultiBo.getDeptId()), SysUser::getDeptId, sysUserMultiBo.getDeptId());
+ queryWrapper.eq(StringUtils.isNotEmpty(bo.getDeptId()), SysUser::getDeptId, bo.getDeptId());
queryWrapper.eq(SysUser::getStatus, UserStatus.OK.getCode());
if (multiInstance.getType() instanceof SequentialMultiInstanceBehavior) {
List<Long> assigneeList = (List<Long>) runtimeService.getVariable(task.getExecutionId(), multiInstance.getAssigneeList());
@@ -75,9 +75,9 @@
List<Long> userIds = StreamUtils.toList(list, e -> Long.valueOf(e.getAssignee()));
queryWrapper.notIn(CollectionUtil.isNotEmpty(userIds), SysUser::getUserId, userIds);
}
- queryWrapper.like(StringUtils.isNotEmpty(sysUserMultiBo.getUserName()), SysUser::getUserName, sysUserMultiBo.getUserName());
- queryWrapper.like(StringUtils.isNotEmpty(sysUserMultiBo.getNickName()), SysUser::getNickName, sysUserMultiBo.getNickName());
- Page<SysUser> page = new Page<>(sysUserMultiBo.getPageNum(), sysUserMultiBo.getPageSize());
+ queryWrapper.like(StringUtils.isNotEmpty(bo.getUserName()), SysUser::getUserName, bo.getUserName());
+ queryWrapper.like(StringUtils.isNotEmpty(bo.getNickName()), SysUser::getNickName, bo.getNickName());
+ Page<SysUser> page = new Page<>(pageQuery.getFirstNum(), pageQuery.getPageSize());
Page<SysUserVo> userPage = sysUserMapper.selectVoPage(page, queryWrapper);
return TableDataInfo.build(recordPage(userPage));
}
@@ -89,7 +89,7 @@
*/
@Override
@SuppressWarnings("unchecked")
- public List<TaskVo> getWorkflowDeleteMultiInstanceList(String taskId) {
+ public List<TaskVo> getListByDeleteMultiInstance(String taskId) {
Task task = QueryUtils.taskQuery().taskId(taskId).singleResult();
List<Task> taskList = QueryUtils.taskQuery(task.getProcessInstanceId()).list();
MultiInstanceVo multiInstance = WorkflowUtils.isMultiInstance(task.getProcessDefinitionId(), task.getTaskDefinitionKey());
@@ -202,7 +202,7 @@
* @param pageQuery 鍒嗛〉
*/
@Override
- public TableDataInfo<SysUserVo> getUserListByPage(SysUserBo sysUserBo, PageQuery pageQuery) {
+ public TableDataInfo<SysUserVo> getPageByUserList(SysUserBo sysUserBo, PageQuery pageQuery) {
LambdaQueryWrapper<SysUser> queryWrapper = Wrappers.lambdaQuery();
queryWrapper.eq(sysUserBo.getDeptId() != null, SysUser::getDeptId, sysUserBo.getDeptId());
queryWrapper.eq(SysUser::getStatus, UserStatus.OK.getCode());
--
Gitblit v1.9.3