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/controller/ActProcessInstanceController.java | 59 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 31 insertions(+), 28 deletions(-)
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..142386b 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,17 +8,20 @@
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;
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 org.dromara.workflow.service.IActProcessInstanceService;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
import java.util.Arrays;
+import java.util.List;
import java.util.Map;
/**
@@ -37,21 +40,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 +62,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 +72,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));
}
/**
@@ -80,7 +83,7 @@
* @param processInstanceId 娴佺▼瀹炰緥id
*/
@GetMapping("/getHistoryRecord/{processInstanceId}")
- public R<Map<String, Object>> getHistoryRecord(@NotBlank(message = "娴佺▼瀹炰緥id涓嶈兘涓虹┖") @PathVariable String processInstanceId) {
+ public R<List<ActHistoryInfoVo>> getHistoryRecord(@NotBlank(message = "娴佺▼瀹炰緥id涓嶈兘涓虹┖") @PathVariable String processInstanceId) {
return R.ok(actProcessInstanceService.getHistoryRecord(processInstanceId));
}
@@ -91,9 +94,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 +106,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 +118,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 +138,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);
}
/**
--
Gitblit v1.9.3