From c4ab6a24d2825f11a0de0f165667dc533c458a01 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期五, 21 三月 2025 10:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/ProjectProcessController.java | 35 ++++++++++++++++++++++++++++-------
1 files changed, 28 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 19ed1b9..ad5a07b 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);
}
@@ -53,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")
@@ -95,6 +95,13 @@
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 = "鍒嗛〉")
// @PreAuthorize("@ss.hasPermi('projectProcess:page')")
@@ -120,10 +127,24 @@
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