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

Merge branch 'develop' into FOTON

Browse Source
This commit is contained in:
super_liu
2022-02-18 11:29:40 +08:00
parent aad657886c 00f81edd3e
commit 312005bac0
1 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java
+21 -16
View File
@@ -104,6 +104,7 @@ public class BussFsSub2After implements TaskListener{
busBean.save(busProcessNew); busBean.save(busProcessNew);
if(commentCount>=commentUserList.size()){ if(commentCount>=commentUserList.size()){
funEnd(delegateTask, busBean, queryWrapper, object, prcName);
if(nextUserList != null && !nextUserList.isEmpty()){ if(nextUserList != null && !nextUserList.isEmpty()){
for(String nextUser : nextUserList){ for(String nextUser : nextUserList){
BusProcessNew busProcessNewNext = new BusProcessNew(); BusProcessNew busProcessNewNext = new BusProcessNew();
@@ -119,26 +120,30 @@ public class BussFsSub2After implements TaskListener{
} }
} }
}else { }else {
QueryWrapper queryWrapper1 = new QueryWrapper(); funEnd(delegateTask, busBean, queryWrapper, object, prcName);
queryWrapper1.eq("TASK_ID", delegateTask.getId());
queryWrapper.isNotNull("PRC_NAME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
if (!list.isEmpty()) {
BusProcessNew one2 = list.get(0);
one2.setMsgType("clause");
one2.setPId(delegateTask.getProcessInstanceId());
one2.setMesg(object.toJSONString());
one2.setFinishFlag("0");
one2.setTaskInfo(delegateTask.getName());
one2.setPrcName(prcName);
one2.setCommitFlag("0");
one2.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one2);
}
} }
} }
private void funEnd(DelegateTask delegateTask, IBusProcessNewService busBean, QueryWrapper<Datas> queryWrapper, JSONObject object, String prcName) {
QueryWrapper queryWrapper1 = new QueryWrapper();
queryWrapper1.eq("TASK_ID", delegateTask.getId());
queryWrapper.isNotNull("PRC_NAME");
List<BusProcessNew> list = busBean.list(queryWrapper1);
if (!list.isEmpty()) {
BusProcessNew one2 = list.get(0);
one2.setMsgType("clause");
one2.setPId(delegateTask.getProcessInstanceId());
one2.setMesg(object.toJSONString());
one2.setFinishFlag("0");
one2.setTaskInfo(delegateTask.getName());
one2.setPrcName(prcName);
one2.setCommitFlag("0");
one2.setCommitText(object.getString("commentText"));
busBean.saveOrUpdate(one2);
}
}
private String verifyObj(String str){ private String verifyObj(String str){
return (str == null || str.equals("")) ? "" : str; return (str == null || str.equals("")) ? "" : str;
} }