From 9e28453dba6ecf93c6c2234ba38def7c41cf12f0 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 20 一月 2025 18:25:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
flowable/src/main/java/com/ycl/controller/FlowTaskController.java | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/flowable/src/main/java/com/ycl/controller/FlowTaskController.java b/flowable/src/main/java/com/ycl/controller/FlowTaskController.java
index 70a98a4..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;
@@ -74,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鏌ヨ鎸傝浇鐨勮〃鍗曚俊鎭�")
@@ -95,6 +96,12 @@
@GetMapping(value = "/processVariables/{taskId}")
public AjaxResult processVariables(@ApiParam(value = "娴佺▼浠诲姟Id") @PathVariable(value = "taskId") String taskId) {
return flowTaskService.processVariables(taskId);
+ }
+
+ @ApiOperation(value = "鏌ョ湅浠诲姟", response = FormDetailVO.class)
+ @GetMapping(value = "/detail/{taskId}")
+ public AjaxResult detail(@ApiParam(value = "娴佺▼浠诲姟Id") @PathVariable(value = "taskId") String taskId) {
+ return flowTaskService.detail(taskId);
}
@@ -251,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