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 | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/business/src/main/java/com/ycl/controller/ProjectProcessController.java b/business/src/main/java/com/ycl/controller/ProjectProcessController.java index c2a66a7..ad5a07b 100644 --- a/business/src/main/java/com/ycl/controller/ProjectProcessController.java +++ b/business/src/main/java/com/ycl/controller/ProjectProcessController.java @@ -53,10 +53,10 @@ } - @GetMapping("/detail/{projectId}/{processId}") + @PostMapping("/detail") @ApiOperation(value = "鑾峰彇椤圭洰娴佺▼璇︽儏淇℃伅", notes = "鑾峰彇椤圭洰娴佺▼璇︽儏淇℃伅") // @PreAuthorize("@ss.hasPermi('projectProcess:detail')") - public Result detail(ProjectProcessForm form) { + public Result detail(@RequestBody ProjectProcessForm form) { return projectProcessService.detail(form); } @@ -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')") -- Gitblit v1.8.0