From 42a7552b9c8603aeab7f0785eb05270dfbeb0bd3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 02 三月 2025 10:16:20 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
business/src/main/java/com/ycl/controller/ProjectProcessController.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectProcessController.java b/business/src/main/java/com/ycl/controller/ProjectProcessController.java
index 8ee4e96..a26f735 100644
--- a/business/src/main/java/com/ycl/controller/ProjectProcessController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectProcessController.java
@@ -40,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);
}
@@ -119,4 +119,25 @@
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