From abc898e14f9cb35b00a2a696e03217b7ec2791a3 Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 25 Oct 2021 15:35:36 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8Bv3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChargeVerifyAfter.java | 64 +++++++++++++------ .../ChargeVerifyBefore.java | 2 +- .../DirectorChooseAfter.java | 46 +++++++++---- .../DirectorChooseBefore.java | 2 +- .../EngineerReviseAfter.java | 3 +- .../EngineerReviseBefore.java | 2 +- .../EngineerReviseDoneAfter.java | 4 +- .../EngineerReviseDoneBefore.java | 2 +- .../Kev.java | 2 +- .../LeaderVerifyAfter.java | 2 +- .../LeaderVerifyBefore.java | 2 +- .../ManageSignAfter.java | 56 +++++++++++----- .../ManageSignBefore.java | 2 +- .../PresidentVerifyAfter.java | 3 +- .../PresidentVerifyBefore.java | 2 +- .../WriteMaterialAfter.java | 4 +- .../WriteMaterialBefore.java | 2 +- .../WriteMemberInfoAfter.java | 3 +- .../WriteMemberInfoBefore.java | 2 +- 19 files changed, 133 insertions(+), 72 deletions(-) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/ChargeVerifyAfter.java (69%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/ChargeVerifyBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/DirectorChooseAfter.java (75%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/DirectorChooseBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/EngineerReviseAfter.java (97%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/EngineerReviseBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/EngineerReviseDoneAfter.java (96%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/EngineerReviseDoneBefore.java (83%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/Kev.java (96%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/LeaderVerifyAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/LeaderVerifyBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/ManageSignAfter.java (70%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/ManageSignBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/PresidentVerifyAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/PresidentVerifyBefore.java (83%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/WriteMaterialAfter.java (97%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/WriteMaterialBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/WriteMemberInfoAfter.java (97%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/WriteMemberInfoBefore.java (83%) 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 similarity index 69% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ChargeVerifyAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index d1c8827b..d02f1261 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -11,13 +11,12 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; -import io.swagger.models.auth.In; +import org.activiti.engine.ActivitiException; 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; /** @@ -55,26 +54,49 @@ public class ChargeVerifyAfter implements TaskListener { delegateTask.setVariable("chargePassList", objects); } // 审批 - if("1".equals(object.getString("passFlag"))){//通过 - delegateTask.setVariable("pass2",1);//排他通道 - count = delegateTask.getVariable("chargePassCount",Integer.class); - delegateTask.setVariable("chargePassCount",count + 1); - objects = delegateTask.getVariable("chargePassList",JSONArray.class); - objects.add(object); - delegateTask.setVariable("chargePassList",objects); - System.out.println(delegateTask.getVariable("chargePassList")); - if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - }//下一节点 + //防止重复审批同一对象 + List idList = new ArrayList<>(); + if(null == delegateTask.getVariable("chargeIdList")){ + delegateTask.setVariable("chargeIdList", idList); + } + int rat = 0; + idList = delegateTask.getVariable("chargeIdList",List.class); + if(!idList.isEmpty()){ + for(String a : idList){ + if(a.equals(object.getString("member"))){ + rat = 1; + break; + } + } + } + if(rat == 0){ + if("1".equals(object.getString("passFlag"))){//通过 + + idList.add(object.getString("member")); + delegateTask.setVariable("chargeIdList",idList); + + delegateTask.setVariable("pass2",1);//排他通道 + count = delegateTask.getVariable("chargePassCount",Integer.class); + delegateTask.setVariable("chargePassCount",count + 1); + objects = delegateTask.getVariable("chargePassList",JSONArray.class); + objects.add(object); + delegateTask.setVariable("chargePassList",objects); + System.out.println(delegateTask.getVariable("chargePassList")); + if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); + }//下一节点 + } + }else{ + delegateTask.setVariable("pass2",0);//排他通道 + if(StringUtils.isNotBlank(object.getString("member"))) { + nextUserList.add(object.getString("member")); + delegateTask.setVariable("member", nextUserList); + }//驳回重写 } }else{ - delegateTask.setVariable("pass2",0);//排他通道 - if(StringUtils.isNotBlank(object.getString("member"))) { - nextUserList.add(object.getString("member")); - delegateTask.setVariable("member", nextUserList); - }//驳回重写 + throw new ActivitiException("审批过了"); } // 存储当前节点意见 if (null != object.getString("commentText")) { 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 similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ChargeVerifyBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java index fb1345a7..973895b0 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; 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 similarity index 75% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/DirectorChooseAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java index 113d28a7..28ac97a7 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,12 +10,11 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; 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; /** @@ -48,16 +47,39 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("memberList", passMemberList); } - if("1".equals(object.getString("passFlag"))) { - nextUserList.add(object.getString("memberId")); - if (null!=delegateTask.getVariable("memberList")) { - List middle=delegateTask.getVariable("memberList",List.class); - middle.addAll(nextUserList); - delegateTask.setVariable("memberList",middle); - }else { - delegateTask.setVariable("memberList",nextUserList); + //防止重复审批同一对象 + List idList = new ArrayList<>(); + if(null == delegateTask.getVariable("memberIdList")){ + delegateTask.setVariable("memberIdList", idList); + } + int rat = 0; + idList = delegateTask.getVariable("memberIdList",List.class); + if(!idList.isEmpty()){ + for(String a : idList){ + if(a.equals(object.getString("member"))){ + rat = 1; + break; + } } - delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); + } + if(rat == 0){ + if("1".equals(object.getString("passFlag"))) { + + idList.add(object.getString("member")); + delegateTask.setVariable("memberIdList",idList); + + nextUserList.add(object.getString("memberId")); + if (null!=delegateTask.getVariable("memberList")) { + List middle=delegateTask.getVariable("memberList",List.class); + middle.addAll(nextUserList); + delegateTask.setVariable("memberList",middle); + }else { + delegateTask.setVariable("memberList",nextUserList); + } + delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); + } + }else{ + throw new ActivitiException("此对象已经审批过了"); } 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 similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/DirectorChooseBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java index 100ea39a..1d35c523 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; 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 similarity index 97% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index 8e08af6c..6306830a 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -15,7 +15,6 @@ import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** 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 similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java index 69e427cf..f4dea6d0 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; 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 similarity index 96% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseDoneAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java index ffb6d9da..1a34155c 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,11 +12,9 @@ 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.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.List; 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 similarity index 83% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseDoneBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java index 00cbe8f6..383bd819 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/Kev.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java similarity index 96% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/Kev.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java index 2e6df15e..b1d6957b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/Kev.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; /** 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 similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/LeaderVerifyAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index d4d5102d..b93f2208 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; 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 similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/LeaderVerifyBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java index 83570c9a..48074192 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; 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 similarity index 70% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java index 4bbbe7d5..41deea28 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,6 +10,7 @@ import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; @@ -44,25 +45,48 @@ public class ManageSignAfter implements TaskListener { if(null == delegateTask.getVariable("managePassCount")){ delegateTask.setVariable("managePassCount",count); } - //999999999 - if("1".equals(object.getString("passFlag"))) {//通过 - count = delegateTask.getVariable("managePassCount",Integer.class); - count++; - delegateTask.setVariable("managePassCount",count); - if(delegateTask.getVariable("managePassCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ - if(StringUtils.isNotBlank(object.getString("president"))) { - nextUserList.add(object.getString("president")); - delegateTask.setVariable("president", nextUserList); + //防止重复审批同一对象 + List idList = new ArrayList<>(); + if(null == delegateTask.getVariable("manageIdList")){ + delegateTask.setVariable("manageIdList", idList); + } + int rat = 0; + idList = delegateTask.getVariable("manageIdList",List.class); + if(!idList.isEmpty()){ + for(String a : idList){ + if(a.equals(object.getString("manageDepartment"))){ + rat = 1; + break; } - delegateTask.setVariable("pass4",1); } + } + if(rat == 0){ + if("1".equals(object.getString("passFlag"))) {//通过 - }else{ - delegateTask.setVariable("pass4",0); - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); + idList.add(object.getString("manageDepartment")); + delegateTask.setVariable("manageIdList",idList); + + + count = delegateTask.getVariable("managePassCount",Integer.class); + count++; + delegateTask.setVariable("managePassCount",count); + if(delegateTask.getVariable("managePassCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ + if(StringUtils.isNotBlank(object.getString("president"))) { + nextUserList.add(object.getString("president")); + delegateTask.setVariable("president", nextUserList); + } + delegateTask.setVariable("pass4",1); + } + + }else{ + delegateTask.setVariable("pass4",0); + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); + } } + }else{ + throw new ActivitiException("此对象已经审批过了"); } // 存储当前节点意见 if (null != object.getString("commentText")) { 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 similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java index 347e5320..fef0c7f9 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; 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 similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/PresidentVerifyAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index c84f9928..06c36152 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -15,7 +15,6 @@ import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** 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 similarity index 83% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/PresidentVerifyBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java index 6d11b5b7..1899822d 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; 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 similarity index 97% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java index bb801f99..7c9d6437 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,10 +14,8 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; -import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; -import java.util.Date; import java.util.List; /** diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java index 433bd4c9..cc7868e6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; 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 similarity index 97% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMemberInfoAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index a37d5a2d..9ea63399 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -15,7 +15,6 @@ import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** 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 similarity index 83% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMemberInfoBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java index 3d3939a9..042cab05 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 @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; From 44d3c2186c365cdf5ee871453e88381eedf26387 Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Mon, 25 Oct 2021 15:35:51 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B-=E5=89=AF?= =?UTF-8?q?=E6=80=BB=E7=9B=91=E6=89=B9=E5=87=86=E4=BF=AE=E8=AE=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PRGEInspectorApprovalAfter.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java index 535dba62..5295ca4e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java @@ -54,6 +54,8 @@ public class PRGEInspectorApprovalAfter implements TaskListener { if (StringUtils.isNotBlank(object.getString("revisionInformation"))){ delegateTask.setVariable("revisionInformation", object.getString("revisionInformation")); } + }else{ + delegateTask.setVariable("fgfzj", "2"); } From 80de1a5faf906ca6248cd43a3daa0181329a2426 Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 25 Oct 2021 16:02:37 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8Bv1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChargeVerifyAfter.java | 155 ++++++++++++++++++ .../ChargeVerifyBefore.java | 11 ++ .../DirectorChooseAfter.java | 136 +++++++++++++++ .../DirectorChooseBefore.java | 11 ++ .../EngineerReviseAfter.java | 86 ++++++++++ .../EngineerReviseBefore.java | 11 ++ .../EngineerReviseDoneAfter.java | 89 ++++++++++ .../EngineerReviseDoneBefore.java | 11 ++ .../LeaderVerifyAfter.java | 118 +++++++++++++ .../LeaderVerifyBefore.java | 11 ++ .../ManageSignAfter.java | 141 ++++++++++++++++ .../ManageSignBefore.java | 11 ++ .../PresidentVerifyAfter.java | 110 +++++++++++++ .../PresidentVerifyBefore.java | 11 ++ .../WriteMaterialAfter.java | 98 +++++++++++ .../WriteMaterialBefore.java | 12 ++ .../WriteMemberInfoAfter.java | 91 ++++++++++ .../WriteMemberInfoBefore.java | 11 ++ 18 files changed, 1124 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyAfter.java new file mode 100644 index 00000000..db35a098 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyAfter.java @@ -0,0 +1,155 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; +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.List; + +/** + * chargeVerify - 入会人员所在部门负责人审核 + */ +public class ChargeVerifyAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + List nextUserList = new ArrayList(); + + + + Integer count = 0; + + if(null == delegateTask.getVariable("chargePassCount")){ + delegateTask.setVariable("chargePassCount",count); + } + JSONArray objects = new JSONArray(); + if(null == delegateTask.getVariable("chargePassList")) { + delegateTask.setVariable("chargePassList", objects); + } + // 审批 + //防止重复审批同一对象 + List idList = new ArrayList<>(); + if(null == delegateTask.getVariable("chargeIdList")){ + delegateTask.setVariable("chargeIdList", idList); + } + int rat = 0; + idList = delegateTask.getVariable("chargeIdList",List.class); + if(!idList.isEmpty()){ + for(String a : idList){ + if(a.equals(object.getString("member"))){ + rat = 1; + break; + } + } + } + if(rat == 0){ + if("1".equals(object.getString("passFlag"))){//通过 + + idList.add(object.getString("member")); + delegateTask.setVariable("chargeIdList",idList); + + delegateTask.setVariable("pass2",1);//排他通道 + count = delegateTask.getVariable("chargePassCount",Integer.class); + delegateTask.setVariable("chargePassCount",count + 1); + objects = delegateTask.getVariable("chargePassList",JSONArray.class); + objects.add(object); + delegateTask.setVariable("chargePassList",objects); + System.out.println(delegateTask.getVariable("chargePassList")); + if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); + }//下一节点 + } + }else{ + delegateTask.setVariable("pass2",0);//排他通道 + if(StringUtils.isNotBlank(object.getString("member"))) { + nextUserList.add(object.getString("member")); + delegateTask.setVariable("member", nextUserList); + }//驳回重写 + } + }else{ + throw new ActivitiException("审批过了"); + } +// 存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + + + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser", user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName", standName); + String prcName = ""; + +// prcName = standName + "-标准化活动申请入会流程-挑选入会代表"; + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("11"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String nextUser : nextUserList) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(objects.toJSONString()); +// busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyBefore.java new file mode 100644 index 00000000..ef24fbd7 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class ChargeVerifyBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("ChargeVerifyBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseAfter.java new file mode 100644 index 00000000..24a23e69 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseAfter.java @@ -0,0 +1,136 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.ArrayList; +import java.util.List; + +/** + * DirectorChoose - 技术委员会分委会主任/入会代表所在中心主任提名入会代表 + */ +public class DirectorChooseAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + System.out.println("后置搭建完成"); + //如果 他是通过 passFlag==1 + List passMemberList = new ArrayList<>(); + if(null == delegateTask.getVariable("memberList")){ + delegateTask.setVariable("memberList", passMemberList); + } + + //防止重复审批同一对象 + List idList = new ArrayList<>(); + if(null == delegateTask.getVariable("memberIdList")){ + delegateTask.setVariable("memberIdList", idList); + } + int rat = 0; + idList = delegateTask.getVariable("memberIdList",List.class); + if(!idList.isEmpty()){ + for(String a : idList){ + if(a.equals(object.getString("member"))){ + rat = 1; + break; + } + } + } + if(rat == 0){ + if("1".equals(object.getString("passFlag"))) { + + idList.add(object.getString("member")); + delegateTask.setVariable("memberIdList",idList); + + nextUserList.add(object.getString("memberId")); + if (null!=delegateTask.getVariable("memberList")) { + List middle=delegateTask.getVariable("memberList",List.class); + middle.addAll(nextUserList); + delegateTask.setVariable("memberList",middle); + }else { + delegateTask.setVariable("memberList",nextUserList); + } + delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); + } + }else{ + throw new ActivitiException("此对象已经审批过了"); + } + + + // 存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser", user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName", standName); + String prcName = ""; + + prcName = standName + "-标准化活动申请入会流程-挑选入会代表"; + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("11"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String nextUser : nextUserList) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseBefore.java new file mode 100644 index 00000000..79d9da21 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class DirectorChooseBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("DirectorChooseBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseAfter.java new file mode 100644 index 00000000..45fb90b7 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseAfter.java @@ -0,0 +1,86 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +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.List; + +/** + * EngineerRevise - 标准法规工程师汇总修订 + */ +public class EngineerReviseAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + if (StringUtils.isNotBlank(object.getString("leader"))) { + nextUserList.add(object.getString("leader")); + delegateTask.setVariable("leader", nextUserList); + } + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser", user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName", standName); + String prcName = ""; + + prcName = standName + "-标准化活动申请入会流程-挑选入会代表"; + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("11"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String nextUser : nextUserList) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseBefore.java new file mode 100644 index 00000000..b027ee39 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class EngineerReviseBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("EngineerReviseBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneAfter.java new file mode 100644 index 00000000..c83dc307 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneAfter.java @@ -0,0 +1,89 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +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 java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * EngineerReviseDone - 标准法规工程师汇总修订 + */ +public class EngineerReviseDoneAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + + + + + + + //截止时间 流程描述 创建人 + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser", user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName", standName); + String prcName = ""; + + prcName = standName + "-标准化活动申请入会流程-挑选入会代表"; + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("11"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String nextUser : nextUserList) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneBefore.java new file mode 100644 index 00000000..5f355c47 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class EngineerReviseDoneBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("EngineerReviseDoneBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyAfter.java new file mode 100644 index 00000000..a8f3b7c7 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyAfter.java @@ -0,0 +1,118 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +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; + +/** + * LeaderVerify - 标准法规部主管领导审核 + */ +public class LeaderVerifyAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + if("1".equals(object.getString("passFlag"))) {//通过 + delegateTask.setVariable("pass3",1); + if(StringUtils.isNotBlank(object.getString("manageDepartmentList"))) { + + if (object.getString("manageDepartmentList").contains(",")) { + nextUserList = Arrays.asList(object.getString("manageDepartmentList").split(",")); + } else { + nextUserList.add(object.getString("manageDepartmentList")); + } + // 配置多实例 + delegateTask.setVariable("manageDepartmentList", nextUserList); + delegateTask.setVariable("manageDepartmentCount",nextUserList.size()); + + } + }else{ + delegateTask.setVariable("pass3",0); + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); + } + } + // 存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser", user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName", standName); + String prcName = ""; + + prcName = standName + "-标准化活动申请入会流程-挑选入会代表"; + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("11"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String nextUser : nextUserList) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyBefore.java new file mode 100644 index 00000000..1f013ca5 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class LeaderVerifyBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("LeaderVerifyBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignAfter.java new file mode 100644 index 00000000..a35487f4 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignAfter.java @@ -0,0 +1,141 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; +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.List; + +/** + * ManageSign - 费用管理部门会签 + */ +public class ManageSignAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + Integer count = 0; + if(null == delegateTask.getVariable("managePassCount")){ + delegateTask.setVariable("managePassCount",count); + } + //防止重复审批同一对象 + List idList = new ArrayList<>(); + if(null == delegateTask.getVariable("manageIdList")){ + delegateTask.setVariable("manageIdList", idList); + } + int rat = 0; + idList = delegateTask.getVariable("manageIdList",List.class); + if(!idList.isEmpty()){ + for(String a : idList){ + if(a.equals(object.getString("manageDepartment"))){ + rat = 1; + break; + } + } + } + if(rat == 0){ + if("1".equals(object.getString("passFlag"))) {//通过 + + idList.add(object.getString("manageDepartment")); + delegateTask.setVariable("manageIdList",idList); + + + count = delegateTask.getVariable("managePassCount",Integer.class); + count++; + delegateTask.setVariable("managePassCount",count); + if(delegateTask.getVariable("managePassCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ + if(StringUtils.isNotBlank(object.getString("president"))) { + nextUserList.add(object.getString("president")); + delegateTask.setVariable("president", nextUserList); + } + delegateTask.setVariable("pass4",1); + } + + }else{ + delegateTask.setVariable("pass4",0); + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); + } + } + }else{ + throw new ActivitiException("此对象已经审批过了"); + } +// 存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser", user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName", standName); + String prcName = ""; + + prcName = standName + "-标准化活动申请入会流程-挑选入会代表"; + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("11"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String nextUser : nextUserList) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignBefore.java new file mode 100644 index 00000000..5eb24162 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class ManageSignBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("ManageSignBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyAfter.java new file mode 100644 index 00000000..ccf7ecb8 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyAfter.java @@ -0,0 +1,110 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +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.List; + +/** + * PresidentVerify - 技术委员会常务副主任/总院院长审定 + */ +public class PresidentVerifyAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + // 入会申请信息重新封装 + if("1".equals(object.getString("passFlag"))) {//通过 + delegateTask.setVariable("pass5",1); + if(StringUtils.isNotBlank(object.getString("engineerSumDone"))) { + nextUserList.add(object.getString("engineerSumDone")); + delegateTask.setVariable("engineerSumDone", nextUserList); + } + + }else{ + delegateTask.setVariable("pass5",0); + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); + } + } + // 存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser", user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName", standName); + String prcName = ""; + + prcName = standName + "-标准化活动申请入会流程-挑选入会代表"; + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("11"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String nextUser : nextUserList) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyBefore.java new file mode 100644 index 00000000..aa94c4e0 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class PresidentVerifyBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("PresidentVerifyBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialAfter.java new file mode 100644 index 00000000..78a01b90 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialAfter.java @@ -0,0 +1,98 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +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; + +/** + * WriteMasterial - 标准法规工程师填写入会资料 + */ +public class WriteMaterialAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + // 入会申请信息重新封装 + if(StringUtils.isNotBlank(object.getString("directorList"))) { + + if (object.getString("directorList").contains(",")) { + nextUserList = Arrays.asList(object.getString("directorList").split(",")); + } else { + nextUserList.add(object.getString("directorList")); + } + // 配置多实例 + delegateTask.setVariable("directorList", nextUserList); + } + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser", user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName", standName); + String prcName = ""; + + prcName = standName + "-标准化活动申请入会流程-挑选入会代表"; + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("11"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String nextUser : nextUserList) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause");//资源类型--条款 + busProcessNewNext.setPId(delegateTask.getProcessInstanceId());//流程实例Id + busProcessNewNext.setMesg(object.toJSONString());//信息 + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());//节点信息 + busProcessNewNext.setFinishFlag("0");//完成注记 + busProcessNewNext.setTaskInfo(delegateTask.getName());//节点信息 + busProcessNewNext.setUserId(nextUser);//处理人 + busProcessNewNext.setPrcName(prcName);//流程名 + busBean.save(busProcessNewNext); + System.out.println("---------------------user1--------------"); + System.out.println("处理人:" + nextUser); + System.out.println("流程名:" + prcName); + System.out.println("节点信息:" + delegateTask.getName()); + } + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialBefore.java new file mode 100644 index 00000000..be28ead6 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialBefore.java @@ -0,0 +1,12 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class WriteMaterialBefore implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("WriteMaterial-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoAfter.java new file mode 100644 index 00000000..91296c06 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoAfter.java @@ -0,0 +1,91 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +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.List; + +/** + * WriteMemberInfo - 入会代表填写入会信息表 + */ +public class WriteMemberInfoAfter implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + + // + if(StringUtils.isNotBlank(object.getString("charge"))) { + nextUserList.add(object.getString("charge")); + delegateTask.setVariable("charge", nextUserList); + System.out.println(delegateTask.getVariable("charge")); + } + + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser", user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName", standName); + String prcName = ""; + + prcName = standName + "-标准化活动申请入会流程-挑选入会代表"; + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("11"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String nextUser : nextUserList) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoBefore.java new file mode 100644 index 00000000..5032010c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class WriteMemberInfoBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("WriteMemberInfoBefore-前置启动"); + } +} From c2ad71d3be7ee51c7ec702b1e86c6c97cb4b2c79 Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 25 Oct 2021 16:05:20 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8Bv1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChargeVerifyAfter.java | 2 +- .../ChargeVerifyBefore.java | 2 +- .../DirectorChooseAfter.java | 2 +- .../DirectorChooseBefore.java | 2 +- .../EngineerReviseAfter.java | 2 +- .../EngineerReviseBefore.java | 2 +- .../EngineerReviseDoneAfter.java | 2 +- .../EngineerReviseDoneBefore.java | 2 +- .../LeaderVerifyAfter.java | 2 +- .../LeaderVerifyBefore.java | 2 +- .../ManageSignAfter.java | 2 +- .../ManageSignBefore.java | 2 +- .../PresidentVerifyAfter.java | 2 +- .../PresidentVerifyBefore.java | 2 +- .../WriteMaterialAfter.java | 2 +- .../WriteMaterialBefore.java | 2 +- .../WriteMemberInfoAfter.java | 2 +- .../WriteMemberInfoBefore.java | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/ChargeVerifyAfter.java (99%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/ChargeVerifyBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/DirectorChooseAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/DirectorChooseBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/EngineerReviseAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/EngineerReviseBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/EngineerReviseDoneAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/EngineerReviseDoneBefore.java (83%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/LeaderVerifyAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/LeaderVerifyBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/ManageSignAfter.java (99%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/ManageSignBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/PresidentVerifyAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/PresidentVerifyBefore.java (83%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/WriteMaterialAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/WriteMaterialBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/WriteMemberInfoAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/WriteMemberInfoBefore.java (83%) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java similarity index 99% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java index db35a098..be726840 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java index ef24fbd7..816d9331 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java index 24a23e69..44d5db95 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java index 79d9da21..e501d8ac 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java index 45fb90b7..c67e715e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java index b027ee39..283cba83 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java index c83dc307..2006c90c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java similarity index 83% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java index 5f355c47..b9d87ceb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java index a8f3b7c7..e2eb615a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java index 1f013ca5..0930f283 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java similarity index 99% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java index a35487f4..eff4e925 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java index 5eb24162..b9818f88 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java index ccf7ecb8..022e32f1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java similarity index 83% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java index aa94c4e0..b09ae845 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java index 78a01b90..d37571d9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java index be28ead6..1b5f9158 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java index 91296c06..b31bb674 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java similarity index 83% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java index 5032010c..10a9c00a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; From 68857751efd10b6afab5a4cbd73f360b750c11c6 Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Mon, 25 Oct 2021 17:00:50 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MinisterApprovalAfter.java | 120 ++++++++++++++++++ .../MinisterApprovalBefore.java | 11 ++ .../PRGAMStartAfter.java | 109 ++++++++++++++++ .../PRGAMStartBefore.java | 11 ++ .../PresidentApprovalAfter.java | 108 ++++++++++++++++ .../PresidentApprovalBefore.java | 11 ++ .../RevisionInformationAfter.java | 110 ++++++++++++++++ .../RevisionInformationBefore.java | 11 ++ 8 files changed, 491 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java new file mode 100644 index 00000000..152200a8 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java @@ -0,0 +1,120 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +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.List; + +public class MinisterApprovalAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + if("1".equals(object.getString("fgfbz"))){ + delegateTask.setVariable("fgfbz", "1"); + if (StringUtils.isNotBlank(object.getString("presidentId"))){ + delegateTask.setVariable("presidentApproval", object.getString("presidentId")); + } + }else if ("0".equals(object.getString("fgfbz"))){ + delegateTask.setVariable("fgfbz", "0"); + if (StringUtils.isNotBlank(object.getString("revision"))){ + delegateTask.setVariable("revision", object.getString("revision")); + } + }else{ + delegateTask.setVariable("fgfbz", "2"); + } + + //截止时间 流程描述 创建人 +// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser",user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName",username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; +// if(object.getString("signFlag").equals("1")) { +// prcName = standName + "-标准法规清单申请-会签"; +// }else { +// prcName = standName + "-标准法规清单申请-经理审批"; +// } + + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setPrcType("18"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + if (null!=object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if(!list.isEmpty()){ + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo("业务经理审批"); + busProcessNewNext.setUserId(object.getString("jlUserId")); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java new file mode 100644 index 00000000..3fdc0fa9 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class MinisterApprovalBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java new file mode 100644 index 00000000..dce211d3 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java @@ -0,0 +1,109 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +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.List; + +public class PRGAMStartAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + if(StringUtils.isNotBlank(object.getString("ministerId"))){ + delegateTask.setVariable("ministerApproval", object.getString("ministerId")); + } + + //截止时间 流程描述 创建人 +// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser",user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName",username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; +// if(object.getString("signFlag").equals("1")) { +// prcName = standName + "-标准法规清单申请-会签"; +// }else { +// prcName = standName + "-标准法规清单申请-经理审批"; +// } + + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setPrcType("18"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + if (null!=object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if(!list.isEmpty()){ + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo("业务经理审批"); + busProcessNewNext.setUserId(object.getString("jlUserId")); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartBefore.java new file mode 100644 index 00000000..6a3b6b3b --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class PRGAMStartBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java new file mode 100644 index 00000000..39b266e8 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java @@ -0,0 +1,108 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +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.List; + +public class PresidentApprovalAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + if("1".equals(object.getString("gsfz"))){ + delegateTask.setVariable("gsfz", "1"); + }else{ + delegateTask.setVariable("gsfz", "0"); + if (StringUtils.isNotBlank(object.getString("revision"))){ + delegateTask.setVariable("revision", object.getString("revision")); + } + } + + //截止时间 流程描述 创建人 +// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser",user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName",username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setPrcType("18"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + if (null!=object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if(!list.isEmpty()){ + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo("业务经理审批"); + busProcessNewNext.setUserId(object.getString("jlUserId")); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java new file mode 100644 index 00000000..d49c05e3 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class PresidentApprovalBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java new file mode 100644 index 00000000..217c0662 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java @@ -0,0 +1,110 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +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.List; + +public class RevisionInformationAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + if (StringUtils.isNotBlank(object.getString("ministerId"))){ + delegateTask.setVariable("ministerApproval", object.getString("ministerId")); + } + + //截止时间 流程描述 创建人 +// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser",user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName",username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; +// if(object.getString("signFlag").equals("1")) { +// prcName = standName + "-标准法规清单申请-会签"; +// }else { +// prcName = standName + "-标准法规清单申请-经理审批"; +// } + + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setPrcType("18"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + if (null!=object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if(!list.isEmpty()){ + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo("业务经理审批"); + busProcessNewNext.setUserId(object.getString("jlUserId")); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java new file mode 100644 index 00000000..9c79a0ad --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class RevisionInformationBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} From 13bb7a488de6d96bf9aa0955f856a7b80802130c Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Mon, 25 Oct 2021 18:07:01 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E4=BC=9A=E5=90=8E=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApprovalAfter.java | 115 ++++++++++++++++++ .../ApprovalBefore.java | 11 ++ .../InputInformationAfter.java | 109 +++++++++++++++++ .../InputInformationBefore.java | 11 ++ .../PRGAMStartAfter.java | 109 +++++++++++++++++ .../PRGAMStartBefore.java | 11 ++ .../RevisionInformationAfter.java | 109 +++++++++++++++++ .../RevisionInformationBefore.java | 11 ++ 8 files changed, 486 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java new file mode 100644 index 00000000..491bd17d --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java @@ -0,0 +1,115 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +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.List; + +public class ApprovalAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + if("1".equals(object.getString("shyFlag"))){ + delegateTask.setVariable("shyFlag", "1"); + }else{ + delegateTask.setVariable("shyFlag", "0"); + if(StringUtils.isNotBlank(object.getString("revision"))){ + delegateTask.setVariable("revision", object.getString("revision")); + } + } + + //截止时间 流程描述 创建人 +// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser",user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName",username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; +// if(object.getString("signFlag").equals("1")) { +// prcName = standName + "-标准法规清单申请-会签"; +// }else { +// prcName = standName + "-标准法规清单申请-经理审批"; +// } + + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setPrcType("19"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + if (null!=object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if(!list.isEmpty()){ + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo("业务经理审批"); + busProcessNewNext.setUserId(object.getString("jlUserId")); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java new file mode 100644 index 00000000..198cd5e2 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class ApprovalBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java new file mode 100644 index 00000000..dc24f48a --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java @@ -0,0 +1,109 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +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.List; + +public class InputInformationAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + if(StringUtils.isNotBlank(object.getString("approvalId"))){ + delegateTask.setVariable("approval", object.getString("approvalId")); + } + + //截止时间 流程描述 创建人 +// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser",user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName",username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; +// if(object.getString("signFlag").equals("1")) { +// prcName = standName + "-标准法规清单申请-会签"; +// }else { +// prcName = standName + "-标准法规清单申请-经理审批"; +// } + + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setPrcType("19"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + if (null!=object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if(!list.isEmpty()){ + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo("业务经理审批"); + busProcessNewNext.setUserId(object.getString("jlUserId")); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java new file mode 100644 index 00000000..bcb3db24 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class InputInformationBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java new file mode 100644 index 00000000..c2983d43 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java @@ -0,0 +1,109 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +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.List; + +public class PRGAMStartAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + if(StringUtils.isNotBlank(object.getString("inputId"))){ + delegateTask.setVariable("inputInformation", object.getString("inputId")); + } + + //截止时间 流程描述 创建人 +// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser",user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName",username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; +// if(object.getString("signFlag").equals("1")) { +// prcName = standName + "-标准法规清单申请-会签"; +// }else { +// prcName = standName + "-标准法规清单申请-经理审批"; +// } + + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setPrcType("19"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + if (null!=object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if(!list.isEmpty()){ + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo("业务经理审批"); + busProcessNewNext.setUserId(object.getString("jlUserId")); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartBefore.java new file mode 100644 index 00000000..2de7d3e1 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class PRGAMStartBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java new file mode 100644 index 00000000..7c188187 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java @@ -0,0 +1,109 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +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.List; + +public class RevisionInformationAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + if(StringUtils.isNotBlank(object.getString("revision"))){ + delegateTask.setVariable("approval", object.getString("revision")); + } + + //截止时间 流程描述 创建人 +// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser",user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName",username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; +// if(object.getString("signFlag").equals("1")) { +// prcName = standName + "-标准法规清单申请-会签"; +// }else { +// prcName = standName + "-标准法规清单申请-经理审批"; +// } + + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setPrcType("19"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + if (null!=object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if(!list.isEmpty()){ + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo("业务经理审批"); + busProcessNewNext.setUserId(object.getString("jlUserId")); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java new file mode 100644 index 00000000..22b82c13 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class RevisionInformationBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} From 0fd17b796475aea7e07be3bc872462a582fc21be Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Tue, 26 Oct 2021 10:53:09 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B---=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PGREPresidentApprovalAfter.java | 4 ++-- .../PRGEInspectorApprovalAfter.java | 8 ++++---- .../PRGEMinisterConfirmAfter.java | 8 ++++---- .../policyResearchGroupEnrollment/PRGEStartAfter.java | 4 ++-- .../RevisonInformationAfter.java | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java index bf2e1e04..328c30fd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java @@ -48,8 +48,8 @@ public class PGREPresidentApprovalAfter implements TaskListener { delegateTask.setVariable("gsfz", "1"); } else { delegateTask.setVariable("gsfz", "0"); - if (StringUtils.isNotBlank(object.getString("revisionInformation"))) { - delegateTask.setVariable("revisionInformation", object.getString("revisionInformation")); + if (StringUtils.isNotBlank(object.getString("revisionId"))) { + delegateTask.setVariable("revisionInformation", object.getString("revisionId")); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java index 5295ca4e..4cd6cc8a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java @@ -46,13 +46,13 @@ public class PRGEInspectorApprovalAfter implements TaskListener { if ("1".equals(object.getString("fgfzj"))) { delegateTask.setVariable("fgfzj", "1"); - if (StringUtils.isNotBlank(object.getString("presidentApproval"))) { - delegateTask.setVariable("presidentApproval", object.getString("presidentApproval")); + if (StringUtils.isNotBlank(object.getString("presidentId"))) { + delegateTask.setVariable("presidentApproval", object.getString("presidentId")); } } else if ("0".equals(object.getString("fgfzj"))) { delegateTask.setVariable("fgfzj", "0"); - if (StringUtils.isNotBlank(object.getString("revisionInformation"))){ - delegateTask.setVariable("revisionInformation", object.getString("revisionInformation")); + if (StringUtils.isNotBlank(object.getString("revisionId"))){ + delegateTask.setVariable("revisionInformation", object.getString("revisionId")); } }else{ delegateTask.setVariable("fgfzj", "2"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java index 34976211..f4569aac 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java @@ -48,13 +48,13 @@ public class PRGEMinisterConfirmAfter implements TaskListener { if("1".equals(object.getString("fgfbz"))){ delegateTask.setVariable("fgfbz", "1"); - if (StringUtils.isNotBlank(object.getString("inspectorApproval"))){ - delegateTask.setVariable("inspectorApproval", object.getString("inspectorApproval")); + if (StringUtils.isNotBlank(object.getString("inspectorId"))){ + delegateTask.setVariable("inspectorApproval", object.getString("inspectorId")); } }else{ delegateTask.setVariable("fgfbz","0"); - if (StringUtils.isNotBlank(object.getString("revisionInformation"))){ - delegateTask.setVariable("revisionInformation", object.getString("revisionInformation")); + if (StringUtils.isNotBlank(object.getString("revisionId"))){ + delegateTask.setVariable("revisionInformation", object.getString("revisionId")); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java index 25ebb302..d3d527a5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java @@ -44,8 +44,8 @@ public class PRGEStartAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - if(StringUtils.isNotBlank(object.getString("ministerConfirm"))){ - delegateTask.setVariable("ministerConfirm", object.getString("ministerConfirm")); + if(StringUtils.isNotBlank(object.getString("ministerId"))){ + delegateTask.setVariable("ministerConfirm", object.getString("ministerId")); } //截止时间 流程描述 创建人 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java index ed44fbaf..128866a5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java @@ -44,8 +44,8 @@ public class RevisonInformationAfter implements TaskListener { List nextUserList = new ArrayList(); - if (StringUtils.isNotBlank(object.getString("ministerConfirm"))) { - delegateTask.setVariable("ministerConfirm", object.getString("ministerConfirm")); + if (StringUtils.isNotBlank(object.getString("ministerId"))) { + delegateTask.setVariable("ministerConfirm", object.getString("ministerId")); } From 934cadafad76d5646154cfbc1438dbdc423a95a9 Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 26 Oct 2021 11:02:31 +0800 Subject: [PATCH 08/10] taskFinishV1 --- .../AutoStartAfter.java | 89 ++++++++++++++ .../AutoStartBefore.java | 35 ++++++ .../DirectorVerifyAfter.java | 111 ++++++++++++++++++ .../DirectorVerifyBefore.java | 35 ++++++ .../MemberUploadInfoAfter.java | 90 ++++++++++++++ .../MemberUploadInfoBefore.java | 35 ++++++ .../ChargeVerifyAfter.java | 2 +- .../ChargeVerifyBefore.java | 28 ++++- .../DirectorChooseAfter.java | 13 +- .../DirectorChooseBefore.java | 30 ++++- .../EngineerReviseAfter.java | 2 +- .../EngineerReviseBefore.java | 30 ++++- .../EngineerReviseDoneAfter.java | 3 +- .../EngineerReviseDoneBefore.java | 30 ++++- .../LeaderVerifyAfter.java | 4 +- .../LeaderVerifyBefore.java | 30 ++++- .../StandardMeetProcess/ManageSignAfter.java | 13 +- .../StandardMeetProcess/ManageSignBefore.java | 30 ++++- .../PresidentVerifyAfter.java | 2 +- .../PresidentVerifyBefore.java | 30 ++++- .../WriteMaterialAfter.java | 2 +- .../WriteMaterialBefore.java | 30 ++++- .../WriteMemberInfoAfter.java | 2 +- .../WriteMemberInfoBefore.java | 27 ++++- .../ChargeVerifyBefore.java | 30 ++++- .../DirectorChooseAfter.java | 9 +- .../DirectorChooseBefore.java | 31 ++++- .../EngineerReviseBefore.java | 31 ++++- .../EngineerReviseDoneAfter.java | 2 +- .../EngineerReviseDoneBefore.java | 31 ++++- .../LeaderVerifyBefore.java | 31 ++++- .../ManageSignAfter.java | 11 +- .../ManageSignBefore.java | 31 ++++- .../PresidentVerifyBefore.java | 31 ++++- .../WriteMaterialBefore.java | 31 ++++- .../WriteMemberInfoBefore.java | 31 ++++- 36 files changed, 926 insertions(+), 77 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java new file mode 100644 index 00000000..a8232b8a --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java @@ -0,0 +1,89 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; +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.List; + +/** + * chargeVerify - 入会人员所在部门负责人审核 + */ +public class AutoStartAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + List nextUserList = new ArrayList(); + + if(StringUtils.isNotBlank(object.getString("member"))) { + nextUserList.add(object.getString("member")); + delegateTask.setVariable("member", nextUserList); + } + + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser", user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName", standName); + String prcName = ""; + +// prcName = standName + "-标准化活动申请入会流程-挑选入会代表"; + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("13"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String nextUser : nextUserList) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); +// busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java new file mode 100644 index 00000000..4b178638 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java @@ -0,0 +1,35 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; + +public class AutoStartBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + String link = "bzqdfbStep2?prcType=13"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java new file mode 100644 index 00000000..aa7042c4 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java @@ -0,0 +1,111 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; +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.List; + +/** + * chargeVerify - 入会人员所在部门负责人审核 + */ +public class DirectorVerifyAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + List nextUserList = new ArrayList(); + + if("1".equals(object.getString("passFlag"))){ + delegateTask.setVariable("pass",1); + //TODO 流程结束 入库操作待写 + }else{ + delegateTask.setVariable("pass",0); + + if(StringUtils.isNotBlank(object.getString("member"))) { + nextUserList.add(object.getString("member")); + delegateTask.setVariable("member", nextUserList); + } + } + +// 存储当前节点意见 + if (null != object.getString("commentText")) { + QueryWrapper queryWrapper3 = new QueryWrapper(); + queryWrapper3.eq("TASK_ID", delegateTask.getId()); + queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); + List list = busBean.list(queryWrapper3); + if (!list.isEmpty()) { + BusProcessNew busProcessNews = list.get(0); + busProcessNews.setTaskId(delegateTask.getId()); + busProcessNews.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(busProcessNews); + } + } + + + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser", user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName", standName); + String prcName = ""; + +// prcName = standName + "-标准化活动申请入会流程-挑选入会代表"; + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("13"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String nextUser : nextUserList) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); +// busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java new file mode 100644 index 00000000..fe4d6e86 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java @@ -0,0 +1,35 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; + +public class DirectorVerifyBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + String link = "bzqdfbStep2?prcType=13"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java new file mode 100644 index 00000000..8e7d5378 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java @@ -0,0 +1,90 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.ActivitiException; +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.List; + +/** + * chargeVerify - 入会人员所在部门负责人审核 + */ +public class MemberUploadInfoAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //流程信息 + IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + List nextUserList = new ArrayList(); + + + if(StringUtils.isNotBlank(object.getString("director"))) { + nextUserList.add(object.getString("director")); + delegateTask.setVariable("director", nextUserList); + } + + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser", user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName", standName); + String prcName = ""; + +// prcName = standName + "-标准化活动申请入会流程-挑选入会代表"; + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("13"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String nextUser : nextUserList) { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); +// busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java new file mode 100644 index 00000000..c65c239c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java @@ -0,0 +1,35 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; + +public class MemberUploadInfoBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + String link = "bzqdfbStep2?prcType=13"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java index be726840..d2db1bd5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java @@ -129,7 +129,7 @@ public class ChargeVerifyAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); 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 816d9331..f05ca90c 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 @@ -1,11 +1,37 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class ChargeVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("ChargeVerifyBefore-前置启动"); + + String link = "bzqdfbStep2?prcType=12"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java index 44d5db95..44b46fe9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java @@ -9,6 +9,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.listener.standardApplyMeetProcess.Kev; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; @@ -56,18 +57,18 @@ public class DirectorChooseAfter implements TaskListener { idList = delegateTask.getVariable("memberIdList",List.class); if(!idList.isEmpty()){ for(String a : idList){ - if(a.equals(object.getString("member"))){ + if(a.equals(object.getString("memberId"))){ rat = 1; break; } } } + idList.add(object.getString("memberId")); + delegateTask.setVariable("memberIdList",idList); + if(rat == 0){ if("1".equals(object.getString("passFlag"))) { - idList.add(object.getString("member")); - delegateTask.setVariable("memberIdList",idList); - nextUserList.add(object.getString("memberId")); if (null!=delegateTask.getVariable("memberList")) { List middle=delegateTask.getVariable("memberList",List.class); @@ -77,6 +78,8 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("memberList",nextUserList); } delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); + }else{ + //TODO 如果所有人未通过，则结束流程 } }else{ throw new ActivitiException("此对象已经审批过了"); @@ -111,7 +114,7 @@ public class DirectorChooseAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); 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 e501d8ac..c8d7e44d 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 @@ -1,11 +1,35 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class DirectorChooseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("DirectorChooseBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java index c67e715e..f08bb2c5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java @@ -61,7 +61,7 @@ public class EngineerReviseAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); 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 283cba83..4ac43fc2 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 @@ -1,11 +1,35 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class EngineerReviseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("EngineerReviseBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java index 2006c90c..767a5019 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java @@ -43,6 +43,7 @@ public class EngineerReviseDoneAfter implements TaskListener { List nextUserList = new ArrayList(); + //TODO 流程结束，汇总 @@ -64,7 +65,7 @@ public class EngineerReviseDoneAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); 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 b9d87ceb..39876635 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 @@ -1,11 +1,35 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class EngineerReviseDoneBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("EngineerReviseDoneBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java index e2eb615a..1012feb9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java @@ -58,6 +58,8 @@ public class LeaderVerifyAfter implements TaskListener { } }else{ delegateTask.setVariable("pass3",0); + + //若有通过参数重新指定代理人，则更换代理人，否则使用之前节点设定的原有代理人 if(StringUtils.isNotBlank(object.getString("engineerSum"))) { nextUserList.add(object.getString("engineerSum")); delegateTask.setVariable("engineerSum", nextUserList); @@ -93,7 +95,7 @@ public class LeaderVerifyAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); 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 0930f283..41e2fd77 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 @@ -1,11 +1,35 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class LeaderVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("LeaderVerifyBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java index eff4e925..6372a0c8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java @@ -45,6 +45,7 @@ public class ManageSignAfter implements TaskListener { if(null == delegateTask.getVariable("managePassCount")){ delegateTask.setVariable("managePassCount",count); } + //防止重复审批同一对象 List idList = new ArrayList<>(); if(null == delegateTask.getVariable("manageIdList")){ @@ -60,17 +61,15 @@ public class ManageSignAfter implements TaskListener { } } } + idList.add(object.getString("manageDepartment")); + delegateTask.setVariable("manageIdList",idList); if(rat == 0){ if("1".equals(object.getString("passFlag"))) {//通过 - idList.add(object.getString("manageDepartment")); - delegateTask.setVariable("manageIdList",idList); - - count = delegateTask.getVariable("managePassCount",Integer.class); count++; delegateTask.setVariable("managePassCount",count); - if(delegateTask.getVariable("managePassCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ + if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ if(StringUtils.isNotBlank(object.getString("president"))) { nextUserList.add(object.getString("president")); delegateTask.setVariable("president", nextUserList); @@ -80,6 +79,8 @@ public class ManageSignAfter implements TaskListener { }else{ delegateTask.setVariable("pass4",0); + + delegateTask.removeVariable("manageIdList"); if(StringUtils.isNotBlank(object.getString("engineerSum"))) { nextUserList.add(object.getString("engineerSum")); delegateTask.setVariable("engineerSum", nextUserList); @@ -116,7 +117,7 @@ public class ManageSignAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); 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 b9818f88..0b28f2de 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 @@ -1,11 +1,35 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class ManageSignBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("ManageSignBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java index 022e32f1..eed4002b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java @@ -85,7 +85,7 @@ public class PresidentVerifyAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); 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 b09ae845..fe9a1b58 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 @@ -1,11 +1,35 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class PresidentVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("PresidentVerifyBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(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 d37571d9..a8b41cbe 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 @@ -68,7 +68,7 @@ public class WriteMaterialAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); 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 1b5f9158..02b43cd3 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 @@ -1,12 +1,36 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class WriteMaterialBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("WriteMaterial-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java index b31bb674..d1263b6d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java @@ -66,7 +66,7 @@ public class WriteMemberInfoAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); 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 10a9c00a..da8de999 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 @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class WriteMemberInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("WriteMemberInfoBefore-前置启动"); + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } } } 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 973895b0..6683e926 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 @@ -1,11 +1,35 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class ChargeVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("ChargeVerifyBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} 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 28ac97a7..9279bc42 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 @@ -56,18 +56,17 @@ public class DirectorChooseAfter implements TaskListener { idList = delegateTask.getVariable("memberIdList",List.class); if(!idList.isEmpty()){ for(String a : idList){ - if(a.equals(object.getString("member"))){ + if(a.equals(object.getString("memberId"))){ rat = 1; break; } } } + idList.add(object.getString("memberId")); + delegateTask.setVariable("memberIdList",idList); if(rat == 0){ if("1".equals(object.getString("passFlag"))) { - idList.add(object.getString("member")); - delegateTask.setVariable("memberIdList",idList); - nextUserList.add(object.getString("memberId")); if (null!=delegateTask.getVariable("memberList")) { List middle=delegateTask.getVariable("memberList",List.class); @@ -77,6 +76,8 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("memberList",nextUserList); } delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); + }else{ + //TODO 如果所有人未通过，则结束流程 } }else{ throw new ActivitiException("此对象已经审批过了"); 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 1d35c523..2db06f83 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 @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class DirectorChooseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("DirectorChooseBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(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 f4dea6d0..62cfe18a 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 @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class EngineerReviseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("EngineerReviseBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} 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 1a34155c..5eaffa92 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 @@ -44,7 +44,7 @@ public class EngineerReviseDoneAfter implements TaskListener { - + //TODO 流程结束，汇总 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 383bd819..f6686832 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 @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class EngineerReviseDoneBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("EngineerReviseDoneBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(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 48074192..7326eddd 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 @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class LeaderVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("LeaderVerifyBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} 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 41deea28..9aeade8c 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 @@ -60,17 +60,18 @@ public class ManageSignAfter implements TaskListener { } } } + idList.add(object.getString("manageDepartment")); + delegateTask.setVariable("manageIdList",idList); + + if(rat == 0){ if("1".equals(object.getString("passFlag"))) {//通过 - idList.add(object.getString("manageDepartment")); - delegateTask.setVariable("manageIdList",idList); - count = delegateTask.getVariable("managePassCount",Integer.class); count++; delegateTask.setVariable("managePassCount",count); - if(delegateTask.getVariable("managePassCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ + if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ if(StringUtils.isNotBlank(object.getString("president"))) { nextUserList.add(object.getString("president")); delegateTask.setVariable("president", nextUserList); @@ -80,6 +81,8 @@ public class ManageSignAfter implements TaskListener { }else{ delegateTask.setVariable("pass4",0); + delegateTask.removeVariable("manageIdList"); + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { nextUserList.add(object.getString("engineerSum")); delegateTask.setVariable("engineerSum", nextUserList); 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 fef0c7f9..236bd528 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 @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class ManageSignBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("ManageSignBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(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 1899822d..6e21f544 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 @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class PresidentVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("PresidentVerifyBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java index cc7868e6..7a309c87 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java @@ -1,12 +1,37 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class WriteMaterialBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("WriteMaterial-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} 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 042cab05..faff807a 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 @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_mq.service.CreateMQService; +import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; +import java.util.List; + public class WriteMemberInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("WriteMemberInfoBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} From dfbff2dd250411f43feb3c8d6e919cba7b9057f0 Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Tue, 26 Oct 2021 11:04:48 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B---=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MinisterApprovalAfter.java | 4 ++-- .../PresidentApprovalAfter.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java index 152200a8..c0e9c3d0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java @@ -45,8 +45,8 @@ public class MinisterApprovalAfter implements TaskListener { } }else if ("0".equals(object.getString("fgfbz"))){ delegateTask.setVariable("fgfbz", "0"); - if (StringUtils.isNotBlank(object.getString("revision"))){ - delegateTask.setVariable("revision", object.getString("revision")); + if (StringUtils.isNotBlank(object.getString("revisionId"))){ + delegateTask.setVariable("revision", object.getString("revisionId")); } }else{ delegateTask.setVariable("fgfbz", "2"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java index 39b266e8..0a05ed9e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java @@ -41,8 +41,8 @@ public class PresidentApprovalAfter implements TaskListener { delegateTask.setVariable("gsfz", "1"); }else{ delegateTask.setVariable("gsfz", "0"); - if (StringUtils.isNotBlank(object.getString("revision"))){ - delegateTask.setVariable("revision", object.getString("revision")); + if (StringUtils.isNotBlank(object.getString("revisionId"))){ + delegateTask.setVariable("revision", object.getString("revisionId")); } } From eb6a7ae89c493f97ecd2b6abd70eaa5c4e49292d Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Tue, 26 Oct 2021 11:15:01 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E4=BC=9A=E5=90=8E=E6=B5=81=E7=A8=8B---=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../policyResearchGroupAfterMeeting/ApprovalAfter.java | 4 ++-- .../policyResearchGroupAfterMeeting/PRGAMStartAfter.java | 4 ++-- .../RevisionInformationAfter.java | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java index 491bd17d..4c60d505 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java @@ -42,8 +42,8 @@ public class ApprovalAfter implements TaskListener { delegateTask.setVariable("shyFlag", "1"); }else{ delegateTask.setVariable("shyFlag", "0"); - if(StringUtils.isNotBlank(object.getString("revision"))){ - delegateTask.setVariable("revision", object.getString("revision")); + if(StringUtils.isNotBlank(object.getString("revisionId"))){ + delegateTask.setVariable("revision", object.getString("revisionId")); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java index c2983d43..e3b34cda 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java @@ -37,8 +37,8 @@ public class PRGAMStartAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - if(StringUtils.isNotBlank(object.getString("inputId"))){ - delegateTask.setVariable("inputInformation", object.getString("inputId")); + if(StringUtils.isNotBlank(object.getString("applicantId"))){ + delegateTask.setVariable("inputInformation", object.getString("applicantId")); } //截止时间 流程描述 创建人 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java index 7c188187..e736e191 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java @@ -37,8 +37,8 @@ public class RevisionInformationAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - if(StringUtils.isNotBlank(object.getString("revision"))){ - delegateTask.setVariable("approval", object.getString("revision")); + if(StringUtils.isNotBlank(object.getString("approvalId"))){ + delegateTask.setVariable("approval", object.getString("approvalId")); } //截止时间 流程描述 创建人