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 | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectProcessController.java b/business/src/main/java/com/ycl/controller/ProjectProcessController.java
index 40e3749..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;
@@ -34,7 +35,7 @@
@PostMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- @PreAuthorize("@ss.hasPermi('projectProcess:page')")
+// @PreAuthorize("@ss.hasPermi('projectProcess:page')")
public Result page(ProjectProcessQuery query) {
return projectProcessService.page(query);
}
@@ -42,16 +43,30 @@
@PostMapping("/set")
@ApiOperation(value = "椤圭洰璁剧疆娴佺▼", notes = "椤圭洰璁剧疆娴佺▼")
- @PreAuthorize("@ss.hasPermi('projectProcess:set')")
+// @PreAuthorize("@ss.hasPermi('projectProcess:set')")
public Result projectSetProcess(@RequestBody @Validated ProjectProcessForm form) {
return projectProcessService.projectSetProcess(form);
}
- @GetMapping("/{id}")
- @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
- public Result detail(@PathVariable("id") Integer id) {
- return projectProcessService.detail(id);
+ @GetMapping("/detail/{projectId}/{processId}")
+ @ApiOperation(value = "鑾峰彇椤圭洰娴佺▼璇︽儏淇℃伅", notes = "鑾峰彇椤圭洰娴佺▼璇︽儏淇℃伅")
+// @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
+ public Result detail(@PathVariable("projectId") Long projectId, @PathVariable("processId") String processId) {
+ return projectProcessService.detail(projectId, processId);
+ }
+
+ @PostMapping("/start/{projectId}/{processDefId}")
+ @ApiOperation(value = "鍚姩娴佺▼", notes = "鍚姩娴佺▼")
+// @PreAuthorize("@ss.hasPermi('projectProcess:start')")
+ 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