FT/foton-wkflow-rest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
super_liu
2021-12-27 21:13:55 +08:00
parent bade21c7b9 959a87edbd
commit 5a48edc6d8
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7After.java
+8 -1
View File
@@ -58,9 +58,16 @@ public class Step7After implements TaskListener {
if (delegateTask.getVariable("hqCount",Integer.class)==delegateTask.getVariable("responUserList",List.class).size()) {
if (0 == delegateTask.getVariable("hqMark", Integer.class)) {
prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-部长+对接人审批";
nextUserList.addAll(delegateTask.getVariable("zrUserIdList",List.class));
List<String> strings=delegateTask.getVariable("zrUserIdList",List.class);
strings.forEach(s -> {
if (!nextUserList.contains(s)){
nextUserList.add(s);
}
});
delegateTask.setVariable("hqFlag","0");
} else {
prcName =delegateTask.getVariable("cid")+"-标准征求意见流程-标准法规工程师汇总";
delegateTask.setVariable("hqFlag","1");
}
}
src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignAfter.java
+8 -2
View File
@@ -96,10 +96,16 @@ public class ResponUserSignAfter implements TaskListener {
count++;
delegateTask.setVariable("task2OKCount",count);
}
if(count>=delegateTask.getVariable("responUserLists",List.class).size()){
if(count>=responUserList.size()){
if(delegateTask.getVariable("actionFlag",Integer.class)==0){
if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){
List<String> res=new ArrayList<>();
nextUserList.forEach(s -> {
if (!res.contains(s)){
res.add(s);
}
});
for(String nextUser : res){
BusProcessNew busProcessNewNext = new BusProcessNew();
busProcessNewNext.setMsgType("clause");
busProcessNewNext.setPId(delegateTask.getProcessInstanceId());