增加驳回的一些状态

know_sub_business/src/main/java/com/supervision/knowsub/enums/FlowTypeEnum.java

@@ -5,9 +5,9 @@ package com.supervision.knowsub.enums;
  */
 public enum FlowTypeEnum {
 
-    SUBMIT(1, "知识报送"),
+    SUBMIT(1, "知识报送审批"),
-    RECALL(2, "知识撤回"),
+    RECALL(2, "知识撤回审批"),
-    DELETE(3, "知识删除");
+    DELETE(3, "知识删除审批");
 
     private final Integer flowType;
 

know_sub_business/src/main/java/com/supervision/knowsub/service/impl/KnowledgeFlowServiceImpl.java

@@ -143,7 +143,7 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService {
                 .flowType(flowTypeEnum.getFlowType())
                 .flowRuleId(firstRule.getId())
                 .flowRuleOrder(firstRule.getRuleOrder())
-                .processName(firstRule.getRuleName())
+                .processName(flowTypeEnum.getDesc())
                 .remark(remark)
                 .submitUserId(userId)
                 .submitDeptId(deptId)
@@ -222,7 +222,7 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService {
                 KnowledgeFlowRecord newKnowledgeFlowRecord = KnowledgeFlowRecord.builder().type(2).knowledgeId(knowledgeFlowTodo.getKnowledgeId())
                         .flowId(knowledgeFlowTodo.getFlowId()).flowInstanceId(knowledgeFlowTodo.getFlowInstanceId())
                         .flowType(knowledgeFlowTodo.getFlowType()).flowRuleId(currentRule.getId()).flowRuleOrder(currentRule.getRuleOrder())
-                        .processName(currentRule.getRuleName()).processStatus(1).processUserId(user.getId())
+                        .processName("通过").processStatus(1).processUserId(user.getId())
                         .processDeptId(user.getDeptId()).processTime(LocalDateTime.now()).remark(reqVO.getRemark())
                         .submitUserId(submitFlowRecord.getSubmitUserId()).submitDeptId(submitFlowRecord.getSubmitDeptId())
                         .build();
@@ -259,7 +259,7 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService {
                 KnowledgeFlowRecord newKnowledgeFlowRecord = KnowledgeFlowRecord.builder().type(2).knowledgeId(knowledgeFlowTodo.getKnowledgeId())
                         .flowId(knowledgeFlowTodo.getFlowId()).flowInstanceId(knowledgeFlowTodo.getFlowInstanceId())
                         .flowType(knowledgeFlowTodo.getFlowType()).flowRuleId(currentRule.getId()).flowRuleOrder(currentRule.getRuleOrder())
-                        .processName(currentRule.getRuleName()).processStatus(1).processUserId(user.getId())
+                        .processName("通过").processStatus(1).processUserId(user.getId())
                         .processDeptId(user.getDeptId()).processTime(LocalDateTime.now()).remark(reqVO.getRemark())
                         .submitUserId(submitFlowRecord.getSubmitUserId()).submitDeptId(submitFlowRecord.getSubmitDeptId())
                         .build();
@@ -287,7 +287,7 @@ public class KnowledgeFlowServiceImpl implements KnowledgeFlowService {
                     .flowRuleId(currentRule.getId())
                     .flowInstanceId(knowledgeFlowTodo.getFlowInstanceId())
                     .flowRuleOrder(currentRule.getRuleOrder())
-                    .processName(currentRule.getRuleName())
+                    .processName("驳回")
                     .processStatus(2)
                     .processUserId(user.getId())
                     .processDeptId(user.getDeptId())