From e9d3a1a9c1f34263bf2bbe9b319506ba92e66bf3 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 07 二月 2025 17:30:46 +0800
Subject: [PATCH] 任务是否能跳过、容缺的回显
---
flowable/src/main/java/com/ycl/controller/FlowTaskController.java | 31 ++++++++++++++++++++++++-------
1 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/flowable/src/main/java/com/ycl/controller/FlowTaskController.java b/flowable/src/main/java/com/ycl/controller/FlowTaskController.java
index ef3110d..2232c0f 100644
--- a/flowable/src/main/java/com/ycl/controller/FlowTaskController.java
+++ b/flowable/src/main/java/com/ycl/controller/FlowTaskController.java
@@ -7,6 +7,7 @@
import com.ycl.domain.dto.FlowTaskDto;
import com.ycl.domain.vo.FlowQueryVo;
import com.ycl.domain.vo.FlowTaskVo;
+import com.ycl.domain.vo.FormDetailVO;
import com.ycl.service.IFlowTaskService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -22,6 +23,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import java.util.Map;
/**
* <p>宸ヤ綔娴佷换鍔＄鐞�<p>
@@ -73,8 +75,8 @@
@ApiOperation(value = "娴佺▼鍘嗗彶娴佽浆璁板綍", response = FlowTaskDto.class)
@GetMapping(value = "/flowRecord")
- public AjaxResult flowRecord(String procInsId, String deployId) {
- return flowTaskService.flowRecord(procInsId, deployId);
+ public AjaxResult flowRecord(String procInsId) {
+ return flowTaskService.flowRecord(procInsId);
}
@ApiOperation(value = "鏍规嵁浠诲姟ID鏌ヨ鎸傝浇鐨勮〃鍗曚俊鎭�")
@@ -84,7 +86,7 @@
}
- @ApiOperation(value = "娴佺▼鍒濆鍖栬〃鍗�", response = FlowTaskDto.class)
+ @ApiOperation(value = "鑾峰彇娴佺▼鍏宠仈鐨勮〃鍗�", response = FlowTaskDto.class)
@GetMapping(value = "/flowFormData")
public AjaxResult flowFormData(String deployId) {
return flowTaskService.flowFormData(deployId);
@@ -96,7 +98,22 @@
return flowTaskService.processVariables(taskId);
}
- @ApiOperation(value = "瀹℃壒浠诲姟")
+ @ApiOperation(value = "鏌ョ湅浠诲姟", response = FormDetailVO.class)
+ @GetMapping(value = "/detail/{taskId}")
+ public AjaxResult detail(@ApiParam(value = "娴佺▼浠诲姟Id") @PathVariable(value = "taskId") String taskId) {
+ return flowTaskService.detail(taskId);
+ }
+
+
+ @ApiOperation(value = "瀹屾垚鎻愪氦琛ㄥ崟浠诲姟/鏅�氭彁浜�")
+ @Log(title = "瀹屾垚鎻愪氦琛ㄥ崟浠诲姟/鏅�氭彁浜�", businessType = BusinessType.INSERT)
+ @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);
+ }
+
+ @ApiOperation(value = "瀹屾垚瀹℃壒浠诲姟")
@Log(title = "瀹℃壒浠诲姟", businessType = BusinessType.UPDATE)
@PostMapping(value = "/complete")
public AjaxResult complete(@RequestBody FlowTaskVo flowTaskVo) {
@@ -241,13 +258,13 @@
/**
* 娴佺▼鑺傜偣淇℃伅
*
- * @param procInsId 娴佺▼瀹炰緥id
+ * @param processInsId 娴佺▼瀹炰緥id
* @return
*/
@GetMapping("/flowXmlAndNode")
- public AjaxResult flowXmlAndNode(@RequestParam(value = "procInsId", required = false) String procInsId,
+ public AjaxResult flowXmlAndNode(@RequestParam(value = "processInsId", required = false) String processInsId,
@RequestParam(value = "deployId", required = false) String deployId) {
- return flowTaskService.flowXmlAndNode(procInsId, deployId);
+ return flowTaskService.flowXmlAndNode(processInsId, deployId);
}
/**
--
Gitblit v1.8.0