优化工作流 流程

java110-bean/src/main/java/com/java110/vo/api/complaint/ApiComplaintDataVo.java

@@ -3,7 +3,6 @@ package com.java110.vo.api.complaint;
 import com.java110.vo.api.junkRequirement.PhotoVo;
 
 import java.io.Serializable;
-import java.util.Date;
 import java.util.List;
 
 public class ApiComplaintDataVo implements Serializable {
@@ -38,6 +37,7 @@ public class ApiComplaintDataVo implements Serializable {
     private String currentUserId;
     private String currentUserName;
     private String currentUserTel;
+    private String startUserId;
 
 
     public String getComplaintId() {
@@ -223,4 +223,12 @@ public class ApiComplaintDataVo implements Serializable {
     public void setPhotos(List<PhotoVo> photos) {
         this.photos = photos;
     }
+
+    public String getStartUserId() {
+        return startUserId;
+    }
+
+    public void setStartUserId(String startUserId) {
+        this.startUserId = startUserId;
+    }
 }

service-common/src/main/java/com/java110/common/smo/impl/WorkflowInnerServiceSMOImpl.java

@@ -354,9 +354,9 @@ public class WorkflowInnerServiceSMOImpl extends BaseServiceSMO implements IWork
                         }
                     }
                     //最后一个节点  并行网关-汇聚到结束节点
-                    if (y == (workflowStepDtos.size() - 1)) {
+                    //if (y == (workflowStepDtos.size() - 1)) {
                         process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "parallelGateway-join-endEvent", "${flag=='false'}"));
-                    }
+                   // }
                 } else {
                     //普通流转
                     //第一个节点
@@ -375,14 +375,16 @@ public class WorkflowInnerServiceSMOImpl extends BaseServiceSMO implements IWork
                         }
                     }
                     //是否最后一个节点
-                    if (y == (workflowStepDtos.size() - 1)) {
+                  /*  if (y == (workflowStepDtos.size() - 1)) {
                         //审核节点到结束节点
                         process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "task" + y + "endEvent", "${flag=='false'}"));
                         process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, "${flag=='false'}"));
                     } else {
                         //审核节点到回退节点
                         process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, "${flag=='false'}"));
-                    }
+                    }*/
+                    process.addFlowElement(createSequenceFlow("repulse" + y, "endEvent", "task" + y + "endEvent", "${flag=='false'}"));
+                    process.addFlowElement(createSequenceFlow("task" + y, "repulse" + y, "task-repulse" + y, "${flag=='false'}"));
                     process.addFlowElement(createSequenceFlow("repulse" + y, "task" + y, "repulse-task" + y, "${flag=='true'}"));
                 }
             }