diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java index 49af23f0..4d21bec3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java @@ -19,6 +19,7 @@ import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Arrays; import java.util.Date; import java.util.List; @@ -67,10 +68,16 @@ public class BussLibrary7After implements TaskListener{ if(StringUtils.isNotBlank(approvalOpinion)){ if ("0".equalsIgnoreCase(approvalOpinion)) { - if(StringUtils.isNotBlank(object.getString("jsfzrUserId"))){ + if(StringUtils.isNotBlank(object.getString("bzUserId"))){ - delegateTask.setVariable("jsfzrUserId",object.getString("jsfzrUserId")); - nextUserList.add(object.getString("jsfzrUserId")); + if(object.getString("bzUserId").contains(",")){ + nextUserList = Arrays.asList(object.getString("bzUserId").split(",")); + }else { + nextUserList.add(object.getString("bzUserId")); + } + // 配置多实例 + delegateTask.setVariable("bzUserIdList",nextUserList); + delegateTask.addCandidateUsers(nextUserList); BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); // 评分存储 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java index aee978f6..cb476a9e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; /** - * 技术委员会负责人/起草中心主任审核后 + * 技术委员会负责人/起草中心主任审核后( 合并至9) */ public class BussLibrary8After implements TaskListener{ @Override diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8Before.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8Before.java index fc2755a3..50cecd5c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8Before.java @@ -11,7 +11,7 @@ import org.activiti.engine.delegate.TaskListener; import java.util.List; /** - * 技术委员会负责人/起草中心主任审核前 + * 技术委员会负责人/起草中心主任审核前( 合并至9) */ public class BussLibrary8Before implements TaskListener{ @Override diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9After.java index d66492d4..46612baf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary9After.java @@ -67,7 +67,7 @@ public class BussLibrary9After implements TaskListener{ BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); // 评分存储 BussUtils.evalSave(delegateTask, object, prcName, delegateTask.getAssignee()); - delegateTask.setVariable("bzFlag", 0); + delegateTask.setVariable("jsfzrFlag", 0); }else { throw new ActivitiException("1#2副主任用户参数不存在,请配置相关用户"); } @@ -86,7 +86,7 @@ public class BussLibrary9After implements TaskListener{ BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); delegateTask.setVariable("cxdUserId",object.getString("xdUserId")); - delegateTask.setVariable("bzFlag", 1); + delegateTask.setVariable("jsfzrFlag", 1); }else { throw new ActivitiException("1#2修订用户参数不存在,请配置相关用户"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java index b3ddccf3..e9ade23e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct10After.java @@ -61,16 +61,16 @@ public class BussLibraryProduct10After implements TaskListener{ if(StringUtils.isNotBlank(approvalOpinion)){ if ("0".equalsIgnoreCase(approvalOpinion)) { - if(StringUtils.isNotBlank(object.getString("bussUser11"))){ + if(StringUtils.isNotBlank(object.getString("bussUser12"))){ - if(object.getString("bussUser11").contains(",")){ - nextUserList = Arrays.asList(object.getString("bussUser11").split(",")); + if(object.getString("bussUser12").contains(",")){ + nextUserList = Arrays.asList(object.getString("bussUser12").split(",")); }else { - nextUserList.add(object.getString("bussUser11")); + nextUserList.add(object.getString("bussUser12")); } BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); - delegateTask.setVariable("bussUser11",object.getString("bussUser11")); + delegateTask.setVariable("bussUser12",object.getString("bussUser12")); delegateTask.setVariable("bussP10Flag", 0); }else { throw new ActivitiException("1#2总院技术管理中心主任/各事业部主管标准业务高级经理参数不存在,请配置相关用户"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java index bfea2246..2b40337a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct7After.java @@ -70,8 +70,11 @@ public class BussLibraryProduct7After implements TaskListener{ nextUserList.add(object.getString("bussUser8")); } + // 配置多实例 + delegateTask.setVariable("bussUser8List",nextUserList); + delegateTask.addCandidateUsers(nextUserList); + BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); - delegateTask.setVariable("bussUser8",object.getString("bussUser8")); delegateTask.setVariable("bussP7Flag", 0); }else { throw new ActivitiException("1#2总院标准法规部产品标准工程师/各事业部标准法规部参数不存在,请配置相关用户"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java index 70830156..00140b0d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibraryProduct/BussLibraryProduct8After.java @@ -61,16 +61,19 @@ public class BussLibraryProduct8After implements TaskListener{ if(StringUtils.isNotBlank(approvalOpinion)){ if ("0".equalsIgnoreCase(approvalOpinion)) { - if(StringUtils.isNotBlank(object.getString("bussUser9"))){ + if(StringUtils.isNotBlank(object.getString("bussUser10"))){ - if(object.getString("bussUser9").contains(",")){ - nextUserList = Arrays.asList(object.getString("bussUser9").split(",")); + if(object.getString("bussUser10").contains(",")){ + nextUserList = Arrays.asList(object.getString("bussUser10").split(",")); }else { - nextUserList.add(object.getString("bussUser9")); + nextUserList.add(object.getString("bussUser10")); } + // 配置多实例 + delegateTask.setVariable("bussUser10List",nextUserList); + delegateTask.addCandidateUsers(nextUserList); + BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); - delegateTask.setVariable("bussUser9",object.getString("bussUser9")); delegateTask.setVariable("bussP8Flag", 0); }else { throw new ActivitiException("1#2总院标准法规部高级经理/各事业部标准业务/认证业务经理参数不存在,请配置相关用户");