diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java index 2cc46e66..966106d5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/bussFs/BussFsSub2After.java @@ -104,6 +104,7 @@ public class BussFsSub2After implements TaskListener{ busBean.save(busProcessNew); if(commentCount>=commentUserList.size()){ + funEnd(delegateTask, busBean, queryWrapper, object, prcName); if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ BusProcessNew busProcessNewNext = new BusProcessNew(); @@ -119,26 +120,30 @@ public class BussFsSub2After implements TaskListener{ } } }else { - QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("TASK_ID", delegateTask.getId()); - queryWrapper.isNotNull("PRC_NAME"); - List 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); - } + funEnd(delegateTask, busBean, queryWrapper, object, prcName); } } + private void funEnd(DelegateTask delegateTask, IBusProcessNewService busBean, QueryWrapper queryWrapper, JSONObject object, String prcName) { + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + queryWrapper.isNotNull("PRC_NAME"); + List 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){ return (str == null || str.equals("")) ? "" : str; }