bug62867

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java

@@ -14,6 +14,7 @@ import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -62,20 +63,24 @@ public class BussLibraryProduct10After implements TaskListener{
         if(StringUtils.isNotBlank(approvalOpinion)){
             if ("0".equalsIgnoreCase(approvalOpinion)) {
                 if(StringUtils.isNotBlank(object.getString("bussUser12"))){
+                    delegateTask.setVariable("approveUserThrough", (Integer) delegateTask.getVariable("approveUserThrough") + 1);
+                    if (ObjectUtils.equals(delegateTask.getVariable("approveUserThrough"),delegateTask.getVariable("approveUserSize"))) {
+                        if(object.getString("bussUser12").contains(",")){
+                            nextUserList = Arrays.asList(object.getString("bussUser12").split(","));
+                        }else {
+                            nextUserList.add(object.getString("bussUser12"));
+                        }
 
-                    if(object.getString("bussUser12").contains(",")){
+                        BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
-                        nextUserList = Arrays.asList(object.getString("bussUser12").split(","));
+                        delegateTask.setVariable("bussUser12",object.getString("bussUser12"));
-                    }else {
+                        delegateTask.setVariable("bussP10Flag", 0);
-                        nextUserList.add(object.getString("bussUser12"));
                     }
 
-                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
-                    delegateTask.setVariable("bussUser12",object.getString("bussUser12"));
-                    delegateTask.setVariable("bussP10Flag", 0);
                 }else {
                     throw new ActivitiException("1#2总院技术管理中心主任/各事业部主管标准业务高级经理参数不存在,请配置相关用户");
                 }
             } else {
+                delegateTask.setVariable("approveReject",1);
                 if(StringUtils.isNotBlank(object.getString("bussUser6"))) {
                     BusProcessNew busProcessNew = new BusProcessNew();
                     busProcessNew.setMsgType("clause");

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java

@@ -76,6 +76,10 @@ public class BussLibraryProduct7After implements TaskListener{
 
                     BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
                     delegateTask.setVariable("bussP7Flag", 0);
+
+                    //设置下个审批节点操作人数量+通过人数量
+                    delegateTask.setVariable("auditUserSize",nextUserList.size());
+                    delegateTask.setVariable("auditUserThrough",0);
                 }else {
                     throw new ActivitiException("1#2总院标准法规部产品标准工程师/各事业部标准法规部参数不存在,请配置相关用户");
                 }

src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java

@@ -14,10 +14,12 @@ import org.activiti.engine.ActivitiException;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
 import org.apache.commons.lang.StringUtils;
+import org.apache.commons.lang3.ObjectUtils;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 
 /**
  *  总院项目总工/各事业部整车所产品经理审核后
@@ -62,23 +64,31 @@ public class BussLibraryProduct8After implements TaskListener{
         if(StringUtils.isNotBlank(approvalOpinion)){
             if ("0".equalsIgnoreCase(approvalOpinion)) {
                 if(StringUtils.isNotBlank(object.getString("bussUser10"))){
+                    delegateTask.setVariable("auditUserThrough",  (Integer) delegateTask.getVariable("auditUserThrough") + 1);
+                    if (ObjectUtils.equals(delegateTask.getVariable("auditUserSize"),delegateTask.getVariable("auditUserThrough"))) {
+                        if(object.getString("bussUser10").contains(",")){
+                            nextUserList = Arrays.asList(object.getString("bussUser10").split(","));
+                        }else {
+                            nextUserList.add(object.getString("bussUser10"));
+                        }
 
-                    if(object.getString("bussUser10").contains(",")){
+                        // 配置多实例
-                        nextUserList = Arrays.asList(object.getString("bussUser10").split(","));
+                        delegateTask.setVariable("bussUser10List",nextUserList);
-                    }else {
+                        delegateTask.addCandidateUsers(nextUserList);
-                        nextUserList.add(object.getString("bussUser10"));
+
+                        BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
+                        delegateTask.setVariable("bussP8Flag", 0);
+
+                        //设置下个审定节点操作人数量+通过人数量
+                        delegateTask.setVariable("approveUserSize",nextUserList.size());
+                        delegateTask.setVariable("approveUserThrough",0);
                     }
 
-                    // 配置多实例
-                    delegateTask.setVariable("bussUser10List",nextUserList);
-                    delegateTask.addCandidateUsers(nextUserList);
-
-                    BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
-                    delegateTask.setVariable("bussP8Flag", 0);
                 }else {
                     throw new ActivitiException("1#2总院标准法规部高级经理/各事业部标准业务/认证业务经理参数不存在,请配置相关用户");
                 }
             } else {
+                delegateTask.setVariable("auditReject",1);
                 if(StringUtils.isNotBlank(object.getString("bussUser6"))) {
                     BusProcessNew busProcessNew = new BusProcessNew();
                     busProcessNew.setMsgType("clause");