From 504333e56f249d16e71e8ac2a435cf2212040c23 Mon Sep 17 00:00:00 2001
From: cuikaidong <ckd2942379034@163.com>
Date: 星期二, 27 五月 2025 17:32:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/FlowTaskController.java | 12 +++---------
1 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/FlowTaskController.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/FlowTaskController.java
index 0de7455..030a714 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/FlowTaskController.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/controller/FlowTaskController.java
@@ -5,6 +5,7 @@
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.api.vo.Result;
+import org.jeecg.modules.flowable.domain.dto.FlowNextDto;
import org.jeecg.modules.flowable.domain.dto.FlowTaskDto;
import org.jeecg.modules.flowable.domain.vo.FlowTaskVo;
import org.jeecg.modules.flowable.service.IFlowTaskService;
@@ -17,6 +18,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.List;
/**
* <p>宸ヤ綔娴佷换鍔＄鐞�<p>
@@ -56,14 +58,6 @@
@ApiParam(value = "姣忛〉鏉℃暟", required = true) @RequestParam Integer pageSize) {
return flowTaskService.todoList(pageNum, pageSize);
}
-
- @ApiOperation(value = "鑾峰彇宸插姙浠诲姟", response = FlowTaskDto.class)
- @GetMapping(value = "/finishedList")
- public Result finishedList(@ApiParam(value = "褰撳墠椤电爜", required = true) @RequestParam Integer pageNum,
- @ApiParam(value = "姣忛〉鏉℃暟", required = true) @RequestParam Integer pageSize) {
- return flowTaskService.finishedList(pageNum, pageSize);
- }
-
@ApiOperation(value = "娴佺▼鍘嗗彶娴佽浆璁板綍", response = FlowTaskDto.class)
@GetMapping(value = "/flowRecord")
@@ -162,7 +156,7 @@
@ApiOperation(value = "鑾峰彇涓嬩竴鑺傜偣")
@PostMapping(value = "/nextFlowNode")
- public Result getNextFlowNode(@RequestBody FlowTaskVo flowTaskVo) {
+ public Result<List<FlowNextDto>> getNextFlowNode(@RequestBody FlowTaskVo flowTaskVo) {
return flowTaskService.getNextFlowNode(flowTaskVo);
}
--
Gitblit v1.9.3