From 9b3b652cfb16b09a6f9c79c5d1d8f7b2b855f22e Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 17 二月 2025 13:55:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
business/src/main/java/com/ycl/controller/ProjectProcessController.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 49 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 cecbd9e..fa4096b 100644
--- a/business/src/main/java/com/ycl/controller/ProjectProcessController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectProcessController.java
@@ -2,6 +2,7 @@
import com.ycl.common.group.Update;
import com.ycl.common.group.Add;
+import com.ycl.domain.form.*;
import com.ycl.domain.query.TaskQuery;
import org.springframework.validation.annotation.Validated;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -17,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.*;
@@ -74,6 +74,26 @@
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/delegation")
+ @ApiOperation(value = "杞姙", notes = "灏嗕换鍔″鎵樼粰鍏跺畠浜哄姙鐞�")
+// @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
+ public Result taskDelegation(@RequestBody TaskDelegationForm form) {
+ return projectProcessService.taskDelegation(form);
+ }
+
+ @PostMapping("/detail/task/jump")
+ @ApiOperation(value = "璺宠繃浠诲姟", notes = "璺宠繃浠诲姟锛屼笉甯﹁〃鍗曟暟鎹殑瀹屾垚浠诲姟")
+// @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
+ public Result taskJump(@RequestBody TaskJumpForm form) {
+ return projectProcessService.taskJump(form);
+ }
@GetMapping("/to_do_task")
@ApiOperation(value = "鍒嗛〉", notes = "鍒嗛〉")
@@ -81,9 +101,36 @@
public Result getAllTodoTask(ProjectProcessQuery query) {
Result result = Result.ok();
- projectProcessService.getAllTodoTask("", (int) query.getPageSize(), (int) query.getCurrentPage(), result);
+ projectProcessService.getIndexTodoTask("", (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);
+ }
+
+ @PostMapping("/detail/task/supervise")
+ @ApiOperation(value = "鐫ｅ姙", notes = "鐫ｅ姙")
+// @PreAuthorize("@ss.hasPermi('projectProcess:detail')")
+ public Result taskSupervise(@Validated @RequestBody TaskSuperviseForm form) {
+ return projectProcessService.taskSupervise(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