From 66ab2fd86f0b6f6c22f7ee9b31221635480211b5 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Sun, 28 Apr 2024 16:56:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B5=81=E7=A8=8B=E5=9B=9E=E6=89=A7?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JoinStandardFiling/JSFstartAfter.java | 3 +- .../PRFApproveBefore.java | 1 + .../PRFEngineerreviewBefore.java | 1 + .../PRFFillinformationBefore.java | 1 + .../PRFReviewdockBefore.java | 1 + .../PRFUnderengineerBefore.java | 1 + .../PRFstartAfter.java | 30 ++++++++++--------- .../RecommendedApproval/RAstartAfter.java | 28 +++++++++-------- .../ChargeVerifyBefore.java | 1 + .../DirectorChooseBefore.java | 1 + .../EngineerReviseBefore.java | 1 + .../EngineerReviseDoneBefore.java | 1 + .../LeaderVerifyBefore.java | 1 + .../StandardMeetProcess/ManageSignBefore.java | 1 + .../PresidentVerifyBefore.java | 1 + .../WriteMaterialAfter.java | 9 +++--- .../WriteMaterialBefore.java | 1 + .../WriteMemberInfoBefore.java | 1 + 18 files changed, 53 insertions(+), 31 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java index 28084201..43b14ac7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java @@ -11,6 +11,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.Arrays; @@ -76,7 +77,7 @@ public class JSFstartAfter implements TaskListener { busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setUserId("start"); busProcessNews.setPrcName(prcName); - if (object.containsKey("commentText")) { + if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) { busProcessNews.setCommitFlag("1"); busProcessNews.setCommitText(object.getString("commentText")); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java index decdcb09..ec371dc7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java @@ -21,6 +21,7 @@ public class PRFApproveBefore 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/ParticipateRevisionFiling/PRFEngineerreviewBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java index 34b4f18d..5f16eac8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java @@ -21,6 +21,7 @@ public class PRFEngineerreviewBefore 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/ParticipateRevisionFiling/PRFFillinformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java index ad34f0ff..54b4a300 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java @@ -21,6 +21,7 @@ public class PRFFillinformationBefore 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/ParticipateRevisionFiling/PRFReviewdockBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java index 24f116c8..bc18d6f2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java @@ -21,6 +21,7 @@ public class PRFReviewdockBefore 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/ParticipateRevisionFiling/PRFUnderengineerBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java index 3f9e7fed..1a72bec4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java @@ -21,6 +21,7 @@ public class PRFUnderengineerBefore 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/ParticipateRevisionFiling/PRFstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java index 693250c1..8cb61520 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java @@ -11,6 +11,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; import java.util.ArrayList; import java.util.Arrays; @@ -33,7 +34,7 @@ public class PRFstartAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - List nextUserList = new ArrayList(); + List nextUserList = new ArrayList<>(); String ids=object.getString("dockUser"); if(ids.contains(",")){ nextUserList=new ArrayList<>(Arrays.asList(ids.split(","))); @@ -55,7 +56,7 @@ public class PRFstartAfter implements TaskListener { delegateTask.setVariable("prcCreateUserName", username); String prcName = "参与外部标准制修订备案-备案任务下发"; - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -67,20 +68,21 @@ public class PRFstartAfter 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); if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java index eb955ceb..a9c26c4a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java @@ -11,6 +11,8 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -69,20 +71,22 @@ public class RAstartAfter 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); + if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java index 64dcf54e..933c7bb5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java @@ -24,6 +24,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/StandardMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java index 6378a207..391c8fe2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java @@ -23,6 +23,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/StandardMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java index 12728e69..e6dedc16 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java @@ -23,6 +23,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/StandardMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java index 417fd319..d35c94f1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java @@ -23,6 +23,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/StandardMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java index 68af5ca9..407b606f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java @@ -23,6 +23,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/StandardMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java index e3e4ca4d..7730251e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java @@ -23,6 +23,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/StandardMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java index bbb8a082..ceaf3f47 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java @@ -23,6 +23,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/StandardMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java index bab0ec60..47dbbaba 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java @@ -61,7 +61,7 @@ public class WriteMaterialAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { @@ -71,7 +71,6 @@ public class WriteMaterialAfter implements TaskListener { one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - if (null != object.getString("commentText")) { BusProcessNew busProcessNews = new BusProcessNew(); busProcessNews.setMsgType("clause"); busProcessNews.setPId(delegateTask.getProcessInstanceId()); @@ -82,9 +81,11 @@ public class WriteMaterialAfter implements TaskListener { busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setUserId("start"); busProcessNews.setPrcName(prcName); - busProcessNews.setCommitText(object.getString("commentText")); + if (object.containsKey("commentText") && StringUtils.isNotBlank(object.getString("commentText"))) { + busProcessNews.setCommitFlag("1"); + busProcessNews.setCommitText(object.getString("commentText")); + } busBean.save(busProcessNews); - } JSONObject object1 = object.getJSONObject("ch_pageData"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java index 91e65bf8..643d1074 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java @@ -24,6 +24,7 @@ public class WriteMaterialBefore 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/StandardMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java index 845055e3..df02e8c6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java @@ -23,6 +23,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);