From 982e63b981079caaae2be3ad8bb11d29cf9cd97b Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 24 十二月 2024 14:43:36 +0800
Subject: [PATCH] 驳回使用自带驳回，对已完成流程查看流程推进的处理
---
business/src/main/java/com/ycl/controller/ProjectProcessController.java | 70 +++++++++++++++++++++++++++++++----
1 files changed, 62 insertions(+), 8 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/ProjectProcessController.java b/business/src/main/java/com/ycl/controller/ProjectProcessController.java
index 40e3749..ad52818 100644
--- a/business/src/main/java/com/ycl/controller/ProjectProcessController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectProcessController.java
@@ -2,12 +2,18 @@
import com.ycl.common.group.Update;
import com.ycl.common.group.Add;
+import com.ycl.domain.form.RejectTaskForm;
+import com.ycl.domain.query.TaskQuery;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
import lombok.RequiredArgsConstructor;
+
import java.util.List;
+
import org.springframework.validation.annotation.Validated;
+
import javax.validation.constraints.NotEmpty;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.ycl.service.ProjectProcessService;
@@ -34,24 +40,72 @@
@PostMapping("/page")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
- @PreAuthorize("@ss.hasPermi('projectProcess:page')")
+// @PreAuthorize("@ss.hasPermi('projectProcess:page')")
public Result page(ProjectProcessQuery query) {
return projectProcessService.page(query);
}
@PostMapping("/set")
- @ApiOperation(value = "椤圭洰璁剧疆娴佺▼", notes = "椤圭洰璁剧疆娴佺▼")
- @PreAuthorize("@ss.hasPermi('projectProcess:set')")
+ @ApiOperation(value = "椤圭洰鍙樻洿娴佺▼", notes = "椤圭洰鍙樻洿娴佺▼")
+// @PreAuthorize("@ss.hasPermi('projectProcess:set')")
public Result projectSetProcess(@RequestBody @Validated ProjectProcessForm form) {
return projectProcessService.projectSetProcess(form);
}
- @GetMapping("/{id}")
- @ApiOperation(value = "璇︽儏", notes = "璇︽儏")
- @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
- public Result detail(@PathVariable("id") Integer id) {
- return projectProcessService.detail(id);
+ @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);
}
+
+ @PostMapping("/start/{projectId}/{processDefId}")
+ @ApiOperation(value = "鍚姩娴佺▼", notes = "鍚姩娴佺▼")
+// @PreAuthorize("@ss.hasPermi('projectProcess:start')")
+ public Result startProcess(@PathVariable("projectId") Long projectId, @PathVariable("processDefId") String processDefId) {
+ return projectProcessService.startProcess(projectId, processDefId);
+ }
+
+ @GetMapping("/detail/task/list")
+ @ApiOperation(value = "鑾峰彇浠诲姟鍒楄〃", notes = "鑾峰彇浠诲姟鍒楄〃")
+// @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
+ public Result taskList(TaskQuery query) {
+ return projectProcessService.taskList(query);
+ }
+
+ @GetMapping("/detail/task/is/auditing")
+ @ApiOperation(value = "鑾峰彇浠诲姟鏄惁鏄鎵硅妭鐐�", notes = "鑾峰彇浠诲姟鏄惁鏄鎵硅妭鐐�")
+// @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
+ public Result taskIsAuditing(String processDefId, String taskId) {
+ return projectProcessService.taskIsAuditing(processDefId, taskId);
+ }
+
+ @PostMapping("/detail/task/reject")
+ @ApiOperation(value = "椹冲洖", notes = "椹冲洖")
+// @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
+ public Result rejectTask(@RequestBody RejectTaskForm form) {
+ return projectProcessService.rejectTask(form);
+ }
+
+
+ @GetMapping("/to_do_task")
+ @ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
+// @PreAuthorize("@ss.hasPermi('projectProcess:page')")
+ public Result getAllTodoTask(ProjectProcessQuery query) {
+
+ Result result = Result.ok();
+ projectProcessService.getAllTodoTask("", (int) query.getPageSize(), (int) query.getCurrentPage(), result);
+ return result;
+ }
+
+ @GetMapping("/detail-by-process_ins_id")
+ @ApiOperation(value = "鑾峰彇璇︽儏", notes = "鑾峰彇璇︽儏")
+// @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
+ public Result detailByProcessInsId(TaskQuery query) {
+ return projectProcessService.detailByProcessInsId(query);
+ }
+
+
}
--
Gitblit v1.8.0