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/FlowTaskController.java | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/FlowTaskController.java b/business/src/main/java/com/ycl/controller/FlowTaskController.java
index 9eca0d4..b4a24ac 100644
--- a/business/src/main/java/com/ycl/controller/FlowTaskController.java
+++ b/business/src/main/java/com/ycl/controller/FlowTaskController.java
@@ -98,9 +98,9 @@
}
@ApiOperation(value = "鏌ョ湅浠诲姟", response = FormDetailVO.class)
- @GetMapping(value = "/detail/{taskId}")
- public AjaxResult detail(@ApiParam(value = "娴佺▼浠诲姟Id") @PathVariable(value = "taskId") String taskId) {
- return flowTaskService.detail(taskId);
+ @GetMapping(value = "/detail/{processInsId}/{taskId}")
+ public AjaxResult detail(@ApiParam(value = "娴佺▼瀹炰緥Id") @PathVariable(value = "processInsId") String processInsId, @ApiParam(value = "娴佺▼浠诲姟Id") @PathVariable(value = "taskId") String taskId) {
+ return flowTaskService.detail(processInsId, taskId);
}
@@ -109,7 +109,15 @@
@PostMapping("/complete/form/{taskId}")
public AjaxResult completeSubmitForm(@ApiParam(value = "娴佺▼瀹氫箟id") @PathVariable(value = "taskId") String taskId,
@ApiParam(value = "鍙橀噺闆嗗悎,json瀵硅薄") @RequestBody Map<String, Object> variables) {
- return flowTaskService.completeSubmitForm(taskId, variables);
+ return flowTaskService.completeSubmitForm(taskId, variables, Boolean.TRUE);
+ }
+
+ @ApiOperation(value = "瀹圭己琛ヤ氦")
+ @Log(title = "瀹圭己琛ヤ氦", businessType = BusinessType.INSERT)
+ @PostMapping("/wait/complete/form/{taskId}")
+ public AjaxResult waitCompleteSubmitForm(@ApiParam(value = "娴佺▼瀹氫箟id") @PathVariable(value = "taskId") String taskId,
+ @ApiParam(value = "鍙橀噺闆嗗悎,json瀵硅薄") @RequestBody Map<String, Object> variables) throws IOException {
+ return flowTaskService.waitCompleteSubmitForm(taskId, variables, Boolean.TRUE);
}
@ApiOperation(value = "瀹屾垚瀹℃壒浠诲姟")
--
Gitblit v1.8.0