流程节点隐藏和显示

src/main/java/com/xjrsoft/module/workflow/entity/XjrWorkflowOperateRecord.java

@@ -96,5 +96,5 @@ public class XjrWorkflowOperateRecord implements Serializable {
     private Integer usageScenario;
 
     @ApiModelProperty("是否显示该节点")
-    private Boolean showNode;
+    private Integer showNode;
 }

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -1942,7 +1942,10 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                 //新增流程自定义发起流程记录
                 XjrWorkflowOperateRecord xjrWorkflowOperateRecord = new XjrWorkflowOperateRecord();
                 xjrWorkflowOperateRecord.setNodeId(task.getId());
-                xjrWorkflowOperateRecord.setShowNode(userTaskConfig.getShowNode());
+                xjrWorkflowOperateRecord.setShowNode(0);
+                if(userTaskConfig.getShowNode()){
+                    xjrWorkflowOperateRecord.setShowNode(1);
+                }
                 xjrWorkflowOperateRecord.setNodeName(task.getName());
                 xjrWorkflowOperateRecord.setNodeType(WorkflowConstant.USER_TASK_TYPE_NAME);
                 xjrWorkflowOperateRecord.setProcessId(task.getProcessInstanceId());
@@ -4425,7 +4428,13 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
             recordListVo.setNodeName(workflowOperateRecord.getNodeName());
             recordListVo.setComment(workflowOperateRecord.getOperateInfo());
             recordListVo.setStartTime(workflowOperateRecord.getRecordTime());
-            recordListVo.setShowNode(workflowOperateRecord.getShowNode());
+
+            if(workflowOperateRecord.getShowNode() != null && workflowOperateRecord.getShowNode() == 0){
+                recordListVo.setShowNode(false);
+            }else if(workflowOperateRecord.getShowNode() != null && workflowOperateRecord.getShowNode() == 1){
+                recordListVo.setShowNode(true);
+            }
+
             recordListVo.setCirculateMessage(workflowOperateRecord.getCirculateMessage());
             recordListVos.add(recordListVo);
         }
@@ -5517,6 +5526,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                 String[] approveCommentArr = commentArr[2].split("：");
                 userDefinedProcessRecordListVos.add(new UserDefinedProcessRecordListVo() {{
                     setNodeType(p.getNodeType());
+                    setShowNode(p.getShowNode());
                     setNodeName(p.getNodeName());
                     setComment(p.getComment());
                     setStartTime(p.getStartTime());
@@ -5532,6 +5542,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
                     setNodeType(p.getNodeType());
                     setComment(p.getComment());
                     setStartTime(p.getStartTime());
+                    setShowNode(false);
                     setCirculateMessage(p.getCirculateMessage());
                     setNodeName("流程发起");
                     setApproveResult("发起");

src/main/resources/application.yml

@@ -5,7 +5,7 @@ server:
 spring:
   # 环境 dev|pre|prod
   profiles:
-    active: pre
+    active: dev
   # jackson时间格式化
   jackson:
     time-zone: GMT+8