From f6c5183a6f2e3495108152ec9220586d0c0a0642 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 30 Mar 2022 09:03:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=20--=20=E5=AE=A1=E6=89=B9=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/standardApplyMeetProcess/ChargeVerifyAfter.java | 1 + .../listener/standardApplyMeetProcess/DirectorChooseAfter.java | 1 + .../listener/standardApplyMeetProcess/EngineerReviseAfter.java | 1 + .../standardApplyMeetProcess/EngineerReviseDoneAfter.java | 1 + .../listener/standardApplyMeetProcess/LeaderVerifyAfter.java | 1 + .../listener/standardApplyMeetProcess/ManageSignAfter.java | 1 + .../listener/standardApplyMeetProcess/PresidentVerifyAfter.java | 1 + .../listener/standardApplyMeetProcess/WriteMemberInfoAfter.java | 1 + 8 files changed, 8 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index 3190c7a5..f4848430 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java @@ -88,6 +88,7 @@ public class ChargeVerifyAfter implements TaskListener { List list = busBean.list(queryWrapper3); if (!list.isEmpty()) { BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(busProcessNews); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java index 76f8aa46..a6a52ba0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java @@ -87,6 +87,7 @@ public class DirectorChooseAfter implements TaskListener { List list = busBean.list(queryWrapper3); if (!list.isEmpty()) { BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(busProcessNews); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index 5249a64e..64f7c80c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java @@ -71,6 +71,7 @@ public class EngineerReviseAfter implements TaskListener { List list = busBean.list(queryWrapper3); if (!list.isEmpty()) { BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(busProcessNews); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java index 1e046c9e..19332caf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java @@ -135,6 +135,7 @@ public class EngineerReviseDoneAfter implements TaskListener { List list = busBean.list(queryWrapper3); if (!list.isEmpty()) { BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(busProcessNews); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index fa4816bd..3131ed6e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java @@ -65,6 +65,7 @@ public class LeaderVerifyAfter implements TaskListener { List list = busBean.list(queryWrapper3); if (!list.isEmpty()) { BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(busProcessNews); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java index 73721a27..236ca1d3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java @@ -68,6 +68,7 @@ public class ManageSignAfter implements TaskListener { List list = busBean.list(queryWrapper3); if (!list.isEmpty()) { BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(busProcessNews); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index 58cd263e..ac8cb422 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java @@ -55,6 +55,7 @@ public class PresidentVerifyAfter implements TaskListener { List list = busBean.list(queryWrapper3); if (!list.isEmpty()) { BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(busProcessNews); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index 91eb7967..a5cca551 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java @@ -70,6 +70,7 @@ public class WriteMemberInfoAfter implements TaskListener { List list = busBean.list(queryWrapper3); if (!list.isEmpty()) { BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskInfo(delegateTask.getName()); busProcessNews.setTaskId(delegateTask.getId()); busProcessNews.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(busProcessNews); From a138ee2d041f9006e59bd95f5cfb6ab2b9e290d3 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 30 Mar 2022 10:29:57 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=20=E5=A6=82=E6=9E=9C=E9=83=BD=E4=B8=8D=E6=B6=89?= =?UTF-8?q?=E5=8F=8A=20=E8=A6=81=E7=94=9F=E6=88=90=E5=B7=B2=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DirectorChooseAfter.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java index a6a52ba0..ed87b78f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java @@ -77,6 +77,35 @@ public class DirectorChooseAfter implements TaskListener { if (delegateTask.getVariable("memberList",List.class).size()==0){ delegateTask.setVariable("passFlag","1"); prcName = prcName + "流程结束"; + int i=1; + if (null!=delegateTask.getVariable("directorListCount")){ + i=delegateTask.getVariable("directorListCount",Integer.class)+1; + delegateTask.setVariable("directorListCount",i); + }else { + delegateTask.setVariable("directorListCount",i); + } + if (i>=delegateTask.getVariable("directorList",List.class).size()){ + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("20"); + one1.setOverTime(OVERTIME); + busProcessNameService.saveOrUpdate(one1); + } + + + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } // 存储当前节点意见