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:
yuezhihang
2021-12-01 17:58:23 +08:00
parent 0c08766db5 bdf3d0b97f
commit a15257a897
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary10After.java
+2 -2
View File
@@ -60,7 +60,7 @@ public class BussLibrary10After implements TaskListener{
nextUserList.add(object.getString("zrUserId")); nextUserList.add(object.getString("zrUserId"));
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
delegateTask.setVariable("bzFlag", 0); delegateTask.setVariable("fzrFlag", 0);
}else { }else {
throw new ActivitiException("1#2副主任用户参数不存在,请配置相关用户"); throw new ActivitiException("1#2副主任用户参数不存在,请配置相关用户");
} }
@@ -79,7 +79,7 @@ public class BussLibrary10After implements TaskListener{
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
delegateTask.setVariable("cxdUserId",object.getString("zqcUsrId")); delegateTask.setVariable("cxdUserId",object.getString("zqcUsrId"));
delegateTask.setVariable("bzFlag", 1); delegateTask.setVariable("fzrFlag", 1);
}else { }else {
throw new ActivitiException("1#2修订用户参数不存在,请配置相关用户"); throw new ActivitiException("1#2修订用户参数不存在,请配置相关用户");
} }
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary4After.java
+1 -1
View File
@@ -85,7 +85,7 @@ public class BussLibrary4After implements TaskListener{
busBean.save(busProcessNew); busBean.save(busProcessNew);
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
delegateTask.setVariable("hzUserId",object.getString("zqcUsrId")); delegateTask.setVariable("chzUserId",object.getString("zqcUsrId"));
delegateTask.setVariable("bzhFlag", 1); delegateTask.setVariable("bzhFlag", 1);
}else { }else {
throw new ActivitiException("1#2汇总用户参数不存在,请配置相关用户"); throw new ActivitiException("1#2汇总用户参数不存在,请配置相关用户");
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary7After.java
+3 -3
View File
@@ -36,9 +36,9 @@ public class BussLibrary7After implements TaskListener{
List<String> nextUserList = new ArrayList(); List<String> nextUserList = new ArrayList();
if(StringUtils.isNotBlank(object.getString("fzrUserId"))){ if(StringUtils.isNotBlank(object.getString("jsfzrUserId"))){
delegateTask.setVariable("fzrUserId",object.getString("fzrUserId")); delegateTask.setVariable("jsfzrUserId",object.getString("jsfzrUserId"));
nextUserList.add(object.getString("fzrUserId")); nextUserList.add(object.getString("jsfzrUserId"));
}else { }else {
throw new ActivitiException("1#2标准化员不存在,请配置相关人员"); throw new ActivitiException("1#2标准化员不存在,请配置相关人员");
} }
src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussLibrary8After.java
+2 -2
View File
@@ -60,7 +60,7 @@ public class BussLibrary8After implements TaskListener{
nextUserList.add(object.getString("bzUserId")); nextUserList.add(object.getString("bzUserId"));
BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList); BussUtils.approvalFunc2(delegateTask, object, prcName, nextUserList);
delegateTask.setVariable("bzhFlag", 0); delegateTask.setVariable("jsfzrFlag", 0);
}else { }else {
throw new ActivitiException("1#2部长用户参数不存在,请配置相关用户"); throw new ActivitiException("1#2部长用户参数不存在,请配置相关用户");
} }
@@ -79,7 +79,7 @@ public class BussLibrary8After implements TaskListener{
BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1"); BussUtils.approvalFunc1(delegateTask, busBean, object, prcName,"1");
delegateTask.setVariable("cxdUserId",object.getString("zqcUsrId")); delegateTask.setVariable("cxdUserId",object.getString("zqcUsrId"));
delegateTask.setVariable("bzhFlag", 1); delegateTask.setVariable("jsfzrFlag", 1);
}else { }else {
throw new ActivitiException("1#2 提交OR驳回参数不存在"); throw new ActivitiException("1#2 提交OR驳回参数不存在");
} }