From ec9a95eb994018cc1ba28a80946165f795001dea Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 29 十一月 2024 16:49:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/ProjectProcessController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectProcessController.java b/business/src/main/java/com/ycl/controller/ProjectProcessController.java
index 9024cbf..31de96f 100644
--- a/business/src/main/java/com/ycl/controller/ProjectProcessController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectProcessController.java
@@ -2,6 +2,7 @@
import com.ycl.common.group.Update;
import com.ycl.common.group.Add;
+import com.ycl.domain.query.TaskQuery;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import lombok.RequiredArgsConstructor;
@@ -55,10 +56,17 @@
return projectProcessService.detail(projectId, processId);
}
- @PostMapping("/start/{projectId}/{processId}")
+ @PostMapping("/start/{projectId}/{processDefId}")
@ApiOperation(value = "鍚姩娴佺▼", notes = "鍚姩娴佺▼")
// @PreAuthorize("@ss.hasPermi('projectProcess:start')")
- public Result startProcess(@PathVariable("projectId") String projectId, @PathVariable("processId") String processId) {
- return projectProcessService.startProcess(projectId, processId);
+ public Result startProcess(@PathVariable("projectId") String projectId, @PathVariable("processDefId") String processDefId) {
+ return projectProcessService.startProcess(projectId, processDefId);
+ }
+
+ @GetMapping("/detail/task/list")
+ @ApiOperation(value = "鑾峰彇浠诲姟鍒楄〃", notes = "鑾峰彇浠诲姟鍒楄〃")
+// @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
+ public Result taskList(TaskQuery query) {
+ return projectProcessService.taskList(query);
}
}
--
Gitblit v1.8.0