From 5450c79246026066978b70be83f08dfcd863d405 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期三, 09 四月 2025 10:12:49 +0800
Subject: [PATCH] 办理任务表单被禁用bug
---
business/src/main/java/com/ycl/controller/FlowTaskController.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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..1186cda 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 = "瀹屾垚瀹℃壒浠诲姟")
@@ -118,6 +126,7 @@
public AjaxResult complete(@RequestBody FlowTaskVo flowTaskVo) {
return flowTaskService.complete(flowTaskVo);
}
+
@ApiOperation(value = "椹冲洖浠诲姟")
@Log(title = "椹冲洖浠诲姟", businessType = BusinessType.UPDATE)
@@ -267,7 +276,7 @@
}
/**
- * 娴佺▼鑺傜偣琛ㄥ崟
+ * 娴佺▼鑺傜偣琛ㄥ崟-褰撳墠浠诲姟鍙婂墠缃换鍔�
*
* @param taskId 娴佺▼浠诲姟缂栧彿
* @return
@@ -277,6 +286,17 @@
return flowTaskService.flowTaskForm(taskId);
}
+ /**
+ * 娴佺▼鑺傜偣琛ㄥ崟-褰撳墠浠诲姟
+ *
+ * @param taskId 娴佺▼浠诲姟缂栧彿
+ * @return
+ */
+ @GetMapping("/current/flowTaskForm")
+ public AjaxResult currentFlowTaskForm(@RequestParam(value = "taskId", required = false) String taskId) {
+ return flowTaskService.currentFlowTaskForm(taskId);
+ }
+
/**
* 娴佺▼鑺傜偣淇℃伅
--
Gitblit v1.8.0