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;