From b5b28e8b9c639f49e69efc60684e68bf642d1092 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 21 六月 2023 16:43:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowProcessTSController.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowProcessTSController.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowProcessTSController.java
index 37ecad5..d617577 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowProcessTSController.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/controller/FlowProcessTSController.java
@@ -2,8 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.vci.ubcs.flow.engine.entity.FlowTaskUser;
-import com.vci.ubcs.flow.engine.entity.FlowTaskUserC;
+import com.vci.ubcs.flow.engine.entity.FlowTaskDTO;
import com.vci.ubcs.flow.engine.entity.ProcessStageAttr;
import com.vci.ubcs.flow.engine.entity.ProcessTemplate;
import com.vci.ubcs.flow.engine.service.FlowEngineService;
@@ -81,7 +80,7 @@
* 娴佺▼闃舵锛岃繖涓祦绋嬬殑鍚勪釜鑺傜偣
*/
@GetMapping("/sslist")
- public R<List<Map<String,String>>> sslist(@RequestParam String modelKey) {
+ public R<List<FlowTaskDTO>> sslist(@RequestParam String modelKey) {
return R.data(flowEngineService.getNodeByFlowableKey(modelKey));
}
@@ -105,7 +104,7 @@
* @return
*/
@PostMapping("sasou")
- public R<ProcessTemplate> stageAttributeSaveOrUpdate(@RequestBody FlowTaskUserC flowTaskUserC) {
+ public R<ProcessTemplate> stageAttributeSaveOrUpdate(@RequestBody FlowTaskDTO flowTaskUserC) {
processStageAttrService.saveOrUpdateUser(flowTaskUserC);
return R.success("淇濆瓨鎴愬姛");
}
--
Gitblit v1.9.3