From 839919c37a00a55bc57b21bcf519a113fcbd37ba Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期六, 22 二月 2025 17:22:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/ProjectProcessController.java | 39 +++++++++++++++++++++++++++++++++++----
1 files changed, 35 insertions(+), 4 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..a26f735 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);
}
@@ -90,6 +88,12 @@
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);
+ }
@GetMapping("/to_do_task")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
@@ -109,4 +113,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