bug 46474 修复
This commit is contained in:
+38
-20
@@ -36,7 +36,7 @@ public class MinisterAndDockerSignAfter implements TaskListener {
|
||||
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
|
||||
if("1".equals(object.getString("actionFlag"))){
|
||||
delegateTask.setVariable("actionFlag",1);
|
||||
nextUserList.add(delegateTask.getVariable("startUser",String.class));
|
||||
// nextUserList.add(delegateTask.getVariable("startUser",String.class));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -82,6 +82,10 @@ public class MinisterAndDockerSignAfter implements TaskListener {
|
||||
busBean.update(busProcessNew,updataWapper);
|
||||
|
||||
Integer count=delegateTask.getVariable("task3OKCount",Integer.class);
|
||||
Integer gose=0;
|
||||
if (null!=delegateTask.getVariable("task3Count",Integer.class)){
|
||||
gose=delegateTask.getVariable("task3Count",Integer.class);
|
||||
}
|
||||
List<String> userList=delegateTask.getVariable("userList",List.class);
|
||||
|
||||
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
|
||||
@@ -89,40 +93,54 @@ public class MinisterAndDockerSignAfter implements TaskListener {
|
||||
count++;
|
||||
delegateTask.setVariable("task3OKCount",count);
|
||||
}
|
||||
if(count>=userList.size()){
|
||||
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
|
||||
if(nextUserList != null && !nextUserList.isEmpty()){
|
||||
for(String nextUser : nextUserList){
|
||||
delegateTask.setVariable("task3Count",gose+1);
|
||||
if (gose+1==userList.size()) {
|
||||
if (count >= userList.size()) {
|
||||
if (delegateTask.getVariable("actionFlag", Integer.class) == 0) {
|
||||
if (nextUserList != null && !nextUserList.isEmpty()) {
|
||||
for (String nextUser : nextUserList) {
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
} else {
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(nextUser);
|
||||
busProcessNewNext.setTaskInfo("技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任审定");
|
||||
busProcessNewNext.setUserId(delegateTask.getVariable("directorUser", String.class));
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}else {
|
||||
} else {
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo("技术委员会相关专委会主任/研究总院职能部门领导,技术管理中心主任审定");
|
||||
busProcessNewNext.setUserId(delegateTask.getVariable("directorUser", String.class));
|
||||
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
|
||||
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
}else{
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo("标准法规工程师调研汇总");
|
||||
busProcessNewNext.setUserId(delegateTask.getVariable("startUser", String.class));
|
||||
busBean.save(busProcessNewNext);
|
||||
}else {
|
||||
BusProcessNew busProcessNewNext = new BusProcessNew();
|
||||
busProcessNewNext.setMsgType("clause");
|
||||
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
|
||||
busProcessNewNext.setMesg(object.toJSONString());
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
|
||||
busProcessNewNext.setFinishFlag("0");
|
||||
busProcessNewNext.setTaskInfo(delegateTask.getName());
|
||||
busProcessNewNext.setUserId(delegateTask.getVariable("startUser",String.class));
|
||||
busBean.save(busProcessNewNext);
|
||||
}
|
||||
delegateTask.setVariable("task3Count",0);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user