调整代码

know_sub_business/src/main/java/com/supervision/knowsub/controller/system/FlowManageController.java

@@ -26,14 +26,14 @@ public class FlowManageController {
     @Operation(summary = "新建流程")
     @PostMapping("/save")
     public String saveFlow(@RequestBody FlowInfoReqVo flowInfoReqVo) {
-
+        flowInfoReqVo.setFlowTypeListForFlowType();
         return flowManageService.saveFlow(flowInfoReqVo);
     }
 
     @Operation(summary = "修改流程")
     @PostMapping("/update")
     public void updateFlow(@RequestBody FlowInfoReqVo flowInfoReqVo) {
-
+        flowInfoReqVo.setFlowTypeListForFlowType();
         flowManageService.updateFlow(flowInfoReqVo);
     }
 
@@ -64,7 +64,8 @@ public class FlowManageController {
     @Operation(summary = "查询流程详情")
     @GetMapping("/getFlowDetail")
     public FlowDetailResVo getFlowDetail(@Parameter(name = "flowId",description = "流程id") @RequestParam("flowId") String flowId) {
-
+        FlowDetailResVo flowDetail = flowManageService.getFlowDetail(flowId);
-        return flowManageService.getFlowDetail(flowId);
+        flowDetail.setFlowTypeFromFlowTypeIdList();
+        return flowDetail;
     }
 }

know_sub_model/src/main/java/com/supervision/knowsub/vo/flow/FlowDetailResVo.java

@@ -1,8 +1,12 @@
 package com.supervision.knowsub.vo.flow;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.json.JSONUtil;
+import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Builder;
 import lombok.Data;
 import lombok.experimental.Tolerate;
+import lombok.extern.slf4j.Slf4j;
 
 import java.util.List;
 
@@ -10,6 +14,7 @@ import java.util.List;
  * 流程详情返回对象
  */
 @Data
+@Slf4j
 @Builder
 public class FlowDetailResVo {
 
@@ -22,10 +27,23 @@ public class FlowDetailResVo {
 
     private List<String> subLibraryIdList;
 
+    @Schema(description = "数据类型集合 1知识报送 2:知识撤回 3 知识删除",hidden = true)
     private List<Integer> flowTypeIdList;
 
+    @Schema(description = "数据类型 1知识报送 2:知识撤回 3 知识删除")
+    private Integer flowType;
+
     private List<NodeInfo> nodeInfoList;
     @Tolerate
     public FlowDetailResVo() {
     }
+
+    public void setFlowTypeFromFlowTypeIdList() {
+        if (CollUtil.isNotEmpty(this.flowTypeIdList)){
+            this.flowType = this.flowTypeIdList.get(0);
+            if (CollUtil.size(this.flowTypeIdList)>1){
+                log.warn("流程flowTypeIdList为{}的流程类型id集合长度大于1，取第一个值作为流程类型", JSONUtil.toJsonStr(this.flowTypeIdList));
+            }
+        }
+    }
 }

know_sub_model/src/main/java/com/supervision/knowsub/vo/flow/FlowInfoReqVo.java

@@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
 import java.util.List;
+import java.util.Objects;
 
 @Data
 public class FlowInfoReqVo {
@@ -17,9 +18,12 @@ public class FlowInfoReqVo {
     @Schema(description = "备注")
     private String remark;
 
-    @Schema(description = "数据类型集合 1知识报送 2:知识撤回 3 知识删除")
+    @Schema(description = "数据类型集合 1知识报送 2:知识撤回 3 知识删除",hidden = true)
     private List<Integer> flowTypeList;
 
+    @Schema(description = "数据类型集合 1知识报送 2:知识撤回 3 知识删除")
+    private Integer flowType;
+
     @Schema(description = "应用库id集合")
     private List<String> baseIdList;
 
@@ -28,4 +32,10 @@ public class FlowInfoReqVo {
     private List<NodeInfo> nodeInfoList;
 
 
+    public void setFlowTypeListForFlowType() {
+        if (Objects.nonNull(this.flowType)){
+            this.flowTypeList = List.of(this.flowType);
+        }
+    }
+
 }