diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java index 475e88cc..342bb473 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java @@ -23,6 +23,7 @@ public class ChargeVerifyBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java index 34411513..f0d0cdac 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java @@ -24,6 +24,7 @@ public class DirectorChooseBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java index cdbe19ed..c60753e7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java @@ -24,6 +24,7 @@ public class EngineerReviseBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java index ffed6d8c..ba61ab2b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java @@ -24,6 +24,7 @@ public class EngineerReviseDoneBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java index 22058ddd..161aa8b2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java @@ -26,6 +26,7 @@ public class LeaderVerifyBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java index 8659bb5c..3cf69697 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java @@ -24,6 +24,7 @@ public class ManageSignBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java index 0324f75a..c40cfe12 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java @@ -24,6 +24,7 @@ public class PresidentVerifyBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java index 1ac74d8a..d1e17c6e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java @@ -77,20 +77,21 @@ public class WriteMaterialAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } - if (null != object.getString("commentText")) { - BusProcessNew busProcessNews = new BusProcessNew(); - busProcessNews.setMsgType("clause"); - busProcessNews.setPId(delegateTask.getProcessInstanceId()); - busProcessNews.setMesg(object.toJSONString()); - busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNews.setFinishFlag("0"); - busProcessNews.setTaskInfo(delegateTask.getName()); - busProcessNews.setTaskId(delegateTask.getId()); - busProcessNews.setUserId("start"); - busProcessNews.setPrcName(prcName); + BusProcessNew busProcessNews = new BusProcessNew(); + busProcessNews.setMsgType("clause"); + busProcessNews.setPId(delegateTask.getProcessInstanceId()); + busProcessNews.setMesg(object.toJSONString()); + busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNews.setFinishFlag("0"); + busProcessNews.setTaskInfo(delegateTask.getName()); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setUserId("start"); + busProcessNews.setPrcName(prcName); + if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) { + busProcessNews.setCommitFlag("1"); busProcessNews.setCommitText(object.getString("commentText")); - busBean.save(busProcessNews); } + busBean.save(busProcessNews); JSONObject object1 = object.getJSONObject("rh_pageData"); WgWorkGroupShowDTO wgWorkGroupShowDTO = new WgWorkGroupShowDTO(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java index 844af9b0..63b19d66 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java @@ -24,6 +24,7 @@ public class WriteMemberInfoBefore implements TaskListener { List list = busBean.list(queryWrapper1); if(!list.isEmpty()){ BusProcessNew one1 = list.get(0); + one1.setTaskInfo(delegateTask.getName()); one1.setTaskId(delegateTask.getId()); busBean.saveOrUpdate(one1);