From c8f2fc9d5f974828289cc790bb4b599cd541ade9 Mon Sep 17 00:00:00 2001 From: xiangpei <xiangpei@timesnew.cn> Date: 星期一, 03 三月 2025 03:14:16 +0800 Subject: [PATCH] 工程库调整 --- business/src/main/java/com/ycl/controller/ProjectProcessController.java | 44 ++++++++++++++++++++++++++++++++++---------- 1 files changed, 34 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 ac00f25..c2a66a7 100644 --- a/business/src/main/java/com/ycl/controller/ProjectProcessController.java +++ b/business/src/main/java/com/ycl/controller/ProjectProcessController.java @@ -2,9 +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.TaskJumpForm; +import com.ycl.domain.form.*; import com.ycl.domain.query.TaskQuery; import org.springframework.validation.annotation.Validated; import org.springframework.security.access.prepost.PreAuthorize; @@ -20,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.*; @@ -43,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); } @@ -59,15 +56,15 @@ @GetMapping("/detail/{projectId}/{processId}") @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(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") @@ -116,4 +113,31 @@ } + @PostMapping("/detail/task/supervise") + @ApiOperation(value = "鐫e姙", notes = "鐫e姙") +// @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