From a0020e9ccac495a6bb9efedc2c2f523277387081 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 26 三月 2025 00:09:24 +0800
Subject: [PATCH] 按时完成的任务还需要排除被驳回的
---
business/src/main/java/com/ycl/controller/FlowTaskController.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/business/src/main/java/com/ycl/controller/FlowTaskController.java b/business/src/main/java/com/ycl/controller/FlowTaskController.java
index 9bc8d62..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);
}
@@ -112,6 +112,14 @@
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 = "瀹屾垚瀹℃壒浠诲姟")
@Log(title = "瀹℃壒浠诲姟", businessType = BusinessType.UPDATE)
@PostMapping(value = "/complete")
--
Gitblit v1.8.0