From e741864c61d3e2238a5fa233e3820dd3831ab941 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期一, 10 二月 2025 16:00:52 +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 31de96f..ac00f25 100644
--- a/business/src/main/java/com/ycl/controller/ProjectProcessController.java
+++ b/business/src/main/java/com/ycl/controller/ProjectProcessController.java
@@ -2,13 +2,20 @@
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.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;
@@ -42,7 +49,7 @@
@PostMapping("/set")
- @ApiOperation(value = "椤圭洰璁剧疆娴佺▼", notes = "椤圭洰璁剧疆娴佺▼")
+ @ApiOperation(value = "椤圭洰鍙樻洿娴佺▼", notes = "椤圭洰鍙樻洿娴佺▼")
// @PreAuthorize("@ss.hasPermi('projectProcess:set')")
public Result projectSetProcess(@RequestBody @Validated ProjectProcessForm form) {
return projectProcessService.projectSetProcess(form);
@@ -59,7 +66,7 @@
@PostMapping("/start/{projectId}/{processDefId}")
@ApiOperation(value = "鍚姩娴佺▼", notes = "鍚姩娴佺▼")
// @PreAuthorize("@ss.hasPermi('projectProcess:start')")
- public Result startProcess(@PathVariable("projectId") String projectId, @PathVariable("processDefId") String processDefId) {
+ public Result startProcess(@PathVariable("projectId") Long projectId, @PathVariable("processDefId") String processDefId) {
return projectProcessService.startProcess(projectId, processDefId);
}
@@ -69,4 +76,44 @@
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/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 = "鍒嗛〉")
+// @PreAuthorize("@ss.hasPermi('projectProcess:page')")
+ public Result getAllTodoTask(ProjectProcessQuery query) {
+
+ Result result = Result.ok();
+ 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);
+ }
+
+
}
--
Gitblit v1.8.0