From 1b9936ba920d65df09ab8dba79c6252568ee26e4 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 26 三月 2025 12:16:02 +0800
Subject: [PATCH] 任务统计bug

---
 business/src/main/java/com/ycl/controller/ProjectProcessController.java |   67 ++++++++++++++++++++++++++++-----
 1 files changed, 57 insertions(+), 10 deletions(-)

diff --git a/business/src/main/java/com/ycl/controller/ProjectProcessController.java b/business/src/main/java/com/ycl/controller/ProjectProcessController.java
index cfc9775..8e40347 100644
--- a/business/src/main/java/com/ycl/controller/ProjectProcessController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectProcessController.java
@@ -2,8 +2,7 @@
 
 import com.ycl.common.group.Update;
 import com.ycl.common.group.Add;
-import com.ycl.domain.form.RejectTaskForm;
-import com.ycl.domain.form.TaskDelegationForm;
+import com.ycl.domain.form.*;
 import com.ycl.domain.query.TaskQuery;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -19,7 +18,6 @@
 import io.swagger.annotations.ApiOperation;
 import com.ycl.service.ProjectProcessService;
 import com.ycl.common.base.Result;
-import com.ycl.domain.form.ProjectProcessForm;
 import com.ycl.domain.query.ProjectProcessQuery;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
@@ -42,7 +40,7 @@
     @PostMapping("/page")
     @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
 //    @PreAuthorize("@ss.hasPermi('projectProcess:page')")
-    public Result page(ProjectProcessQuery query) {
+    public Result page(@RequestBody ProjectProcessQuery query) {
         return projectProcessService.page(query);
     }
 
@@ -55,18 +53,18 @@
     }
 
 
-    @GetMapping("/detail/{projectId}/{processId}")
+    @PostMapping("/detail")
     @ApiOperation(value = "鑾峰彇椤圭洰娴佺▼璇︽儏淇℃伅", notes = "鑾峰彇椤圭洰娴佺▼璇︽儏淇℃伅")
 //    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
-    public Result detail(@PathVariable("projectId") Long projectId, @PathVariable("processId") String processId) {
-        return projectProcessService.detail(projectId, processId);
+    public Result detail(@RequestBody ProjectProcessForm form) {
+        return projectProcessService.detail(form);
     }
 
-    @PostMapping("/start/{projectId}/{processDefId}")
+    @PostMapping("/start")
     @ApiOperation(value = "鍚姩娴佺▼", notes = "鍚姩娴佺▼")
 //    @PreAuthorize("@ss.hasPermi('projectProcess:start')")
-    public Result startProcess(@PathVariable("projectId") Long projectId, @PathVariable("processDefId") String processDefId) {
-        return projectProcessService.startProcess(projectId, processDefId);
+    public Result startProcess(@RequestBody @Validated ProjectProcessForm form) {
+        return projectProcessService.startProcess(form);
     }
 
     @GetMapping("/detail/task/list")
@@ -90,6 +88,19 @@
         return projectProcessService.taskDelegation(form);
     }
 
+    @PostMapping("/detail/task/jump")
+    @ApiOperation(value = "璺宠繃浠诲姟", notes = "璺宠繃浠诲姟锛屼笉甯﹁〃鍗曟暟鎹殑瀹屾垚浠诲姟")
+//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
+    public Result taskJump(@RequestBody TaskJumpForm form) {
+        return projectProcessService.taskJump(form);
+    }
+
+    @PostMapping("/detail/task/wait")
+    @ApiOperation(value = "瀹圭己浠诲姟", notes = "瀹圭己浠诲姟锛屼笉甯﹁〃鍗曟暟鎹殑瀹屾垚浠诲姟")
+//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
+    public Result taskWait(@RequestBody TaskWaitForm form) {
+        return projectProcessService.taskWait(form);
+    }
 
     @GetMapping("/to_do_task")
     @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
@@ -101,6 +112,15 @@
         return result;
     }
 
+    @GetMapping("/wait_task")
+    @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+//    @PreAuthorize("@ss.hasPermi('projectProcess:page')")
+    public Result getWaitTask(ProjectProcessQuery query) {
+        Result result = Result.ok();
+        projectProcessService.getIndexWaitTask("", (int) query.getPageSize(), (int) query.getCurrentPage(), result);
+        return result;
+    }
+
     @GetMapping("/detail-by-process_ins_id")
     @ApiOperation(value = "鑾峰彇璇︽儏", notes = "鑾峰彇璇︽儏")
 //    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
@@ -109,4 +129,31 @@
     }
 
 
+    @PostMapping("/detail/task/supervise")
+    @ApiOperation(value = "鐫ｅ姙", notes = "鐫ｅ姙")
+//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
+    public Result taskSupervise(@Validated @RequestBody TaskSuperviseForm form) {
+        return projectProcessService.taskSupervise(form);
+    }
+
+    @PostMapping("/detail/task/teamwork")
+    @ApiOperation(value = "鍙戣捣鍗忓悓鍔炵悊", notes = "鍙戣捣鍗忓悓鍔炵悊")
+//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
+    public Result taskTeamwork(@Validated @RequestBody TaskTeamWorkForm form) {
+        return projectProcessService.taskTeamwork(form);
+    }
+
+    @PostMapping("/detail/task/hangup")
+    @ApiOperation(value = "鎸傝捣浠诲姟", notes = "鎸傝捣浠诲姟")
+//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
+    public Result taskHangup(@Validated @RequestBody TaskHangupForm form) {
+        return projectProcessService.taskHangup(form);
+    }
+
+    @PostMapping("/detail/task/hangup/cancel")
+    @ApiOperation(value = "鍙栨秷鎸傝捣浠诲姟", notes = "鍙栨秷鎸傝捣浠诲姟")
+//    @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
+    public Result cancelTaskHangup(@Validated @RequestBody TaskHangupForm form) {
+        return projectProcessService.cancelTaskHangup(form);
+    }
 }

--
Gitblit v1.8.0