From 07c4ad96c75dc93b39e002feb19845219fede415 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 29 十一月 2024 16:49:09 +0800
Subject: [PATCH] 全部事项和待办事项查询功能完善

---
 business/src/main/java/com/ycl/controller/ProjectProcessController.java |   36 ++++++++++++++++++++++++++++++------
 1 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/business/src/main/java/com/ycl/controller/ProjectProcessController.java b/business/src/main/java/com/ycl/controller/ProjectProcessController.java
index a95813a..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,15 +35,38 @@
 
     @PostMapping("/page")
     @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
-    @PreAuthorize("@ss.hasPermi('projectProcess:page')")
+//    @PreAuthorize("@ss.hasPermi('projectProcess:page')")
     public Result page(ProjectProcessQuery query) {
         return projectProcessService.page(query);
     }
 
-    @GetMapping("/{id}")
-    @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
-    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
-    public Result detail(@PathVariable("id") Integer id) {
-        return projectProcessService.detail(id);
+
+    @PostMapping("/set")
+    @ApiOperation(value = "椤圭洰璁剧疆娴佺▼", notes = "椤圭洰璁剧疆娴佺▼")
+//    @PreAuthorize("@ss.hasPermi('projectProcess:set')")
+    public Result projectSetProcess(@RequestBody @Validated ProjectProcessForm form) {
+        return projectProcessService.projectSetProcess(form);
+    }
+
+
+    @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