From 99c31d89b0bff265e1181897a341ff42e88060ad Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 29 Oct 2021 14:23:11 +0800 Subject: [PATCH 01/17] taskFinishV1.3 --- .../ChargeVerifyAfter.java | 29 ++++++++++++--- .../EngineerReviseAfter.java | 11 +----- .../EngineerReviseDoneAfter.java | 7 +--- .../LeaderVerifyAfter.java | 11 +++--- .../StandardMeetProcess/ManageSignAfter.java | 16 ++++---- .../PresidentVerifyAfter.java | 16 ++++---- .../WriteMemberInfoAfter.java | 9 ++--- .../ChargeVerifyAfter.java | 37 +++++++++++++++---- .../EngineerReviseAfter.java | 8 ++-- .../EngineerReviseDoneAfter.java | 1 + .../LeaderVerifyAfter.java | 11 +++--- .../ManageSignAfter.java | 19 ++++------ .../PresidentVerifyAfter.java | 17 ++++----- .../WriteMemberInfoAfter.java | 9 +---- 14 files changed, 105 insertions(+), 96 deletions(-) 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 ff78244b..cbc1e186 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 @@ -42,10 +42,13 @@ public class ChargeVerifyAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); + JSONObject sum = new JSONObject(); + if(null == delegateTask.getVariable("membersSumJSON")){ + delegateTask.setVariable("membersSumJSON",sum); + } Integer count = 0; - if(null == delegateTask.getVariable("chargePassCount")){ delegateTask.setVariable("chargePassCount",count); } @@ -72,6 +75,22 @@ public class ChargeVerifyAfter implements TaskListener { if(rat == 0){ if("1".equals(object.getString("passFlag"))){//通过 + JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + + sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); + if(sum.isEmpty()){ + sum = object; + delegateTask.setVariable("membersSumJSON",sum); + }else { + JSONObject o1 = sum.getJSONObject("rh_pageData"); + JSONObject o = os.getJSONObject(0); + JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + os1.add(o); + o1.put("myPartRole",os1); + sum.put("rh_pageData",o1); + delegateTask.setVariable("membersSumJSON",sum); + } + idList.add(object.getString("member")); delegateTask.setVariable("chargeIdList",idList); @@ -85,8 +104,8 @@ public class ChargeVerifyAfter implements TaskListener { 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); - }//下一节点 + delegateTask.setVariable("engineerSum", object.getString("engineerSum")); + } } }else{ delegateTask.setVariable("pass2",0);//排他通道 @@ -141,8 +160,8 @@ prcName = standName + "-标准化活动参会流程-"; BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(objects.toJSONString()); -// busProcessNewNext.setMesg(object.toJSONString()); + JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); + busProcessNewNext.setMesg(hand.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); 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 f92f0fc3..03eb7f94 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 @@ -2,7 +2,6 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; 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; @@ -12,7 +11,6 @@ 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; @@ -29,8 +27,6 @@ public class EngineerReviseAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -38,13 +34,10 @@ public class EngineerReviseAfter implements TaskListener { 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); - } + nextUserList.add(object.getString("leader")); + delegateTask.setVariable("leader", object.getString("leader")); //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); 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 98b03e9d..cfda8128 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 @@ -29,17 +29,13 @@ public class EngineerReviseDoneAfter implements TaskListener { 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(); @@ -47,8 +43,6 @@ public class EngineerReviseDoneAfter implements TaskListener { - - //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); @@ -67,6 +61,7 @@ public class EngineerReviseDoneAfter implements TaskListener { if (one1 != null) { one1.setPrcType("21"); one1.setPrcName(prcName); + one1.setOverTime(OVERTIME); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(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 4d747b85..d749ab91 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,12 +58,11 @@ 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); - } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } } // 存储当前节点意见 if (null != object.getString("commentText")) { 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 7111ccaa..1cd0bdce 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 @@ -70,21 +70,19 @@ public class ManageSignAfter implements TaskListener { count++; delegateTask.setVariable("managePassCount",count); 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); - } + nextUserList.add(object.getString("president")); + delegateTask.setVariable("president", object.getString("president")); delegateTask.setVariable("pass4",1); } }else{ delegateTask.setVariable("pass4",0); - delegateTask.removeVariable("manageIdList"); - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - } +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } }else{ throw new ActivitiException("此对象已经审批过了"); 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 040a9152..3dae16f7 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 @@ -44,17 +44,15 @@ public class PresidentVerifyAfter implements TaskListener { // 入会申请信息重新封装 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); - } - + nextUserList.add(object.getString("engineerSumDone")); + delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone")); }else{ delegateTask.setVariable("pass5",0); - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - } +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } // 存储当前节点意见 if (null != object.getString("commentText")) { 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 5210a0e0..01c4e7f9 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 @@ -43,12 +43,9 @@ public class WriteMemberInfoAfter implements TaskListener { 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")); - } + + nextUserList.add(object.getString("charge")); + delegateTask.setVariable("charge", object.getString("charge")); //截止时间 流程描述 创建人 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index 39efddf1..d6a2ec4a 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,5 +1,6 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,6 +15,7 @@ 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.activiti.engine.impl.json.JsonObjectConverter; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; @@ -31,7 +33,6 @@ public class ChargeVerifyAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -43,9 +44,13 @@ public class ChargeVerifyAfter implements TaskListener { List nextUserList = new ArrayList(); + JSONObject sum = new JSONObject(); + if(null == delegateTask.getVariable("membersSumJSON")){ + delegateTask.setVariable("membersSumJSON",sum); + } + Integer count = 0; - if(null == delegateTask.getVariable("chargePassCount")){ delegateTask.setVariable("chargePassCount",count); } @@ -72,21 +77,37 @@ public class ChargeVerifyAfter implements TaskListener { if(rat == 0){ if("1".equals(object.getString("passFlag"))){//通过 + JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + + sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); + if(sum.isEmpty()){ + sum = object; + delegateTask.setVariable("membersSumJSON",sum); + }else { + JSONObject o1 = sum.getJSONObject("rh_pageData"); + JSONObject o = os.getJSONObject(0); + JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + os1.add(o); + o1.put("myPartRole",os1); + sum.put("rh_pageData",o1); + delegateTask.setVariable("membersSumJSON",sum); + } + 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("pass2",1);//排他通道 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); - }//下一节点 + delegateTask.setVariable("engineerSum", object.getString("engineerSum")); + } } }else{ delegateTask.setVariable("pass2",0);//排他通道 @@ -141,8 +162,8 @@ prcName = standName + "-标准化活动入会流程-"; BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(objects.toJSONString()); -// busProcessNewNext.setMesg(object.toJSONString()); + JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); + busProcessNewNext.setMesg(hand.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index 25572801..b7150d8a 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 @@ -41,10 +41,10 @@ public class EngineerReviseAfter implements TaskListener { List nextUserList = new ArrayList(); - if (StringUtils.isNotBlank(object.getString("leader"))) { - nextUserList.add(object.getString("leader")); - delegateTask.setVariable("leader", nextUserList); - } + nextUserList.add(object.getString("leader")); + delegateTask.setVariable("leader", object.getString("leader")); + + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); 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 26d0728d..f6649dad 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 @@ -67,6 +67,7 @@ public class EngineerReviseDoneAfter implements TaskListener { one1.setPrcType("20"); one1.setPrcName(prcName); one1.setCreatUser(user); + one1.setOverTime(OVERTIME); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index 6aa2397a..84e1d731 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 @@ -30,8 +30,6 @@ public class LeaderVerifyAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -58,10 +56,11 @@ 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); - } +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } // 存储当前节点意见 if (null != object.getString("commentText")) { 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 2197858c..e6a9c5bb 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 @@ -62,31 +62,26 @@ public class ManageSignAfter implements TaskListener { } idList.add(object.getString("manageDepartment")); delegateTask.setVariable("manageIdList",idList); - - if(rat == 0){ if("1".equals(object.getString("passFlag"))) {//通过 - count = delegateTask.getVariable("managePassCount",Integer.class); count++; delegateTask.setVariable("managePassCount",count); 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); - } + nextUserList.add(object.getString("president")); + delegateTask.setVariable("president", object.getString("president")); delegateTask.setVariable("pass4",1); } }else{ delegateTask.setVariable("pass4",0); delegateTask.removeVariable("manageIdList"); - - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - } +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } }else{ throw new ActivitiException("此对象已经审批过了"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index 811aeb38..4e677255 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 @@ -44,17 +44,16 @@ public class PresidentVerifyAfter implements TaskListener { // 入会申请信息重新封装 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); - } - + nextUserList.add(object.getString("engineerSumDone")); + delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone")); }else{ delegateTask.setVariable("pass5",0); - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - } +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); + } // 存储当前节点意见 if (null != object.getString("commentText")) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index 52de2fc8..97ce5683 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 @@ -43,13 +43,8 @@ public class WriteMemberInfoAfter implements TaskListener { 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")); - } - + nextUserList.add(object.getString("charge")); + delegateTask.setVariable("charge",object.getString("charge")); //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); From ca3a26591be95cd8782c538be813e1e709089041 Mon Sep 17 00:00:00 2001 From: Kevin Date: Sat, 30 Oct 2021 18:46:01 +0800 Subject: [PATCH 02/17] =?UTF-8?q?taskFinish-=E6=B5=81=E7=A8=8B=E7=95=85?= =?UTF-8?q?=E9=80=9A=5FprcName=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoStartAfter.java | 4 +- .../DirectorVerifyAfter.java | 4 +- .../MemberUploadInfoAfter.java | 4 +- .../ChargeVerifyAfter.java | 19 +++--- .../DirectorChooseAfter.java | 4 +- .../EngineerReviseAfter.java | 4 +- .../EngineerReviseDoneAfter.java | 13 +++- .../LeaderVerifyAfter.java | 4 +- .../StandardMeetProcess/ManageSignAfter.java | 20 ++----- .../PresidentVerifyAfter.java | 4 +- .../WriteMaterialAfter.java | 4 +- .../WriteMemberInfoAfter.java | 4 +- .../ChargeVerifyAfter.java | 55 +++++------------ .../ChargeVerifyBefore.java | 2 +- .../DirectorChooseAfter.java | 39 +++--------- .../DirectorChooseBefore.java | 2 +- .../EngineerReviseAfter.java | 5 +- .../EngineerReviseBefore.java | 2 +- .../EngineerReviseDoneAfter.java | 22 ++++--- .../EngineerReviseDoneBefore.java | 4 +- .../LeaderVerifyAfter.java | 13 ++-- .../LeaderVerifyBefore.java | 4 +- .../ManageSignAfter.java | 59 ++++++------------- .../ManageSignBefore.java | 4 +- .../PresidentVerifyAfter.java | 16 ++--- .../PresidentVerifyBefore.java | 4 +- .../WriteMaterialAfter.java | 6 +- .../WriteMaterialBefore.java | 18 ------ .../WriteMemberInfoAfter.java | 5 +- .../WriteMemberInfoBefore.java | 2 +- 30 files changed, 118 insertions(+), 232 deletions(-) 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 index cd4735f4..7f52958a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java @@ -55,9 +55,7 @@ public class AutoStartAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动会后流程-"; + String prcName ="标准化活动会后流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 index cbe96e50..d18970e4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java @@ -77,9 +77,7 @@ public class DirectorVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动会后流程-"; + String prcName ="标准化活动会后流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 index bd5ba54e..a545acfe 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java @@ -56,9 +56,7 @@ public class MemberUploadInfoAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动会后流程-"; + String prcName ="标准化活动会后流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 cbc1e186..9d926704 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 @@ -76,7 +76,6 @@ public class ChargeVerifyAfter implements TaskListener { if("1".equals(object.getString("passFlag"))){//通过 JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); if(sum.isEmpty()){ sum = object; @@ -109,10 +108,7 @@ public class ChargeVerifyAfter implements TaskListener { } }else{ delegateTask.setVariable("pass2",0);//排他通道 - if(StringUtils.isNotBlank(object.getString("member"))) { - nextUserList.add(object.getString("member")); - delegateTask.setVariable("member", nextUserList); - }//驳回重写 + nextUserList.add(object.getString("member")); } }else{ throw new ActivitiException("审批过了"); @@ -140,9 +136,7 @@ public class ChargeVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - -prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); @@ -160,8 +154,12 @@ prcName = standName + "-标准化活动参会流程-"; BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); - busProcessNewNext.setMesg(hand.toJSONString()); + if(delegateTask.getVariable("pass2",Integer.class).equals(0)){ + busProcessNewNext.setMesg(object.toJSONString()); + }else{ + JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); + busProcessNewNext.setMesg(hand.toJSONString()); + } busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); @@ -170,5 +168,6 @@ prcName = standName + "-标准化活动参会流程-"; busBean.save(busProcessNewNext); } } + } } 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 a05e2a4a..c5358f64 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 @@ -106,9 +106,7 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 03eb7f94..495dd672 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 @@ -46,9 +46,7 @@ public class EngineerReviseAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 cfda8128..5604b11a 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 @@ -42,7 +42,6 @@ public class EngineerReviseDoneAfter implements TaskListener { //TODO 流程结束，汇总 - //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); @@ -53,7 +52,7 @@ public class EngineerReviseDoneAfter implements TaskListener { delegateTask.setVariable("listName", standName); String prcName = ""; - prcName = standName + "-标准化活动参会流程-"; + prcName = "标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); @@ -80,6 +79,16 @@ public class EngineerReviseDoneAfter implements TaskListener { 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(delegateTask.getName()); + prcName = "标准化活动参会流程" + "会议结束"; + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); } } } 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 d749ab91..2097410b 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 @@ -86,9 +86,7 @@ public class LeaderVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 1cd0bdce..283bfcf6 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 @@ -29,18 +29,16 @@ public class ManageSignAfter implements TaskListener { 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); @@ -65,7 +63,6 @@ public class ManageSignAfter implements TaskListener { delegateTask.setVariable("manageIdList",idList); if(rat == 0){ if("1".equals(object.getString("passFlag"))) {//通过 - count = delegateTask.getVariable("managePassCount",Integer.class); count++; delegateTask.setVariable("managePassCount",count); @@ -77,11 +74,6 @@ 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); -// } nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } }else{ @@ -100,6 +92,8 @@ public class ManageSignAfter implements TaskListener { busBean.saveOrUpdate(busProcessNews); } } + + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); @@ -107,9 +101,7 @@ public class ManageSignAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 3dae16f7..046658d3 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 @@ -75,9 +75,7 @@ public class PresidentVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 501b8f0b..d8e99853 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 @@ -60,9 +60,7 @@ public class WriteMaterialAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 01c4e7f9..42b37ff1 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 @@ -55,9 +55,7 @@ public class WriteMemberInfoAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index d6a2ec4a..d22e6ae1 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 @@ -42,7 +42,7 @@ public class ChargeVerifyAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - + String prcName = "标准化活动入会流程-"; JSONObject sum = new JSONObject(); if(null == delegateTask.getVariable("membersSumJSON")){ @@ -54,31 +54,12 @@ public class ChargeVerifyAfter implements TaskListener { 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"))){//通过 JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); if(sum.isEmpty()){ sum = object; @@ -93,32 +74,24 @@ public class ChargeVerifyAfter implements TaskListener { delegateTask.setVariable("membersSumJSON",sum); } - idList.add(object.getString("member")); - delegateTask.setVariable("chargeIdList",idList); - count = delegateTask.getVariable("chargePassCount",Integer.class); delegateTask.setVariable("chargePassCount",count + 1); - objects = delegateTask.getVariable("chargePassList",JSONArray.class); - objects.add(object); delegateTask.setVariable("pass2",1);//排他通道 - delegateTask.setVariable("chargePassList",objects); + if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ + prcName = prcName + "标准法规工程师汇总修订"; if(StringUtils.isNotBlank(object.getString("engineerSum"))) { nextUserList.add(object.getString("engineerSum")); delegateTask.setVariable("engineerSum", object.getString("engineerSum")); } } }else{ + prcName = prcName + "入会代表填写入会信息表"; delegateTask.setVariable("pass2",0);//排他通道 - if(StringUtils.isNotBlank(object.getString("member"))) { - nextUserList.add(object.getString("member")); - delegateTask.setVariable("member", nextUserList); - }//驳回重写 + nextUserList.add(object.getString("member")); } - }else{ - throw new ActivitiException("审批过了"); - } + // 存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); @@ -142,9 +115,7 @@ public class ChargeVerifyAfter implements TaskListener { 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()); @@ -162,8 +133,12 @@ prcName = standName + "-标准化活动入会流程-"; BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); - busProcessNewNext.setMesg(hand.toJSONString()); + if(delegateTask.getVariable("pass2",Integer.class).equals(0)){ + busProcessNewNext.setMesg(object.toJSONString()); + }else{ + JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); + busProcessNewNext.setMesg(hand.toJSONString()); + } busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); 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 0d99b15d..475e88cc 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 @@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; + String link = "bzrhStep4?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 ce55aeaf..25ce0f64 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 @@ -28,9 +28,6 @@ public class DirectorChooseAfter implements TaskListener { 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()); @@ -40,33 +37,17 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - System.out.println("后置搭建完成"); + String prcName = "标准化活动入会流程-"; + //如果 他是通过 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("memberId"))){ - rat = 1; - break; - } - } - } - idList.add(object.getString("memberId")); - delegateTask.setVariable("memberIdList",idList); - if(rat == 0){ - if("1".equals(object.getString("passFlag"))) { + if("1".equals(object.getString("passFlag"))) { + prcName = prcName + "入会代表填写入会信息表"; nextUserList.add(object.getString("memberId")); if (null!=delegateTask.getVariable("memberList")) { List middle=delegateTask.getVariable("memberList",List.class); @@ -76,12 +57,12 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("memberList",nextUserList); } delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); - }else{ - //TODO 如果所有人未通过，则结束流程 } - }else{ - throw new ActivitiException("此对象已经审批过了"); - } + + if(delegateTask.getVariable("memberCount",Integer.class).equals(0)){ + throw new ActivitiException("所有人不涉及入会，流程终止"); + } + // 存储当前节点意见 @@ -104,9 +85,7 @@ public class DirectorChooseAfter implements TaskListener { 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()); 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 3c7d007b..34411513 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 @@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; + String link = "bzrhStep2?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index b7150d8a..3d3f46cd 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 @@ -40,7 +40,8 @@ public class EngineerReviseAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - + String prcName = "标准化活动入会流程-"; + prcName = prcName + "标准法规部主管领导审核"; nextUserList.add(object.getString("leader")); delegateTask.setVariable("leader", object.getString("leader")); @@ -53,9 +54,7 @@ public class EngineerReviseAfter implements TaskListener { 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()); 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 49c75d79..cdbe19ed 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 @@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; + String link = "bzrhStep5?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); 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 f6649dad..5b301984 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 @@ -30,21 +30,18 @@ public class EngineerReviseDoneAfter implements TaskListener { //流程信息 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 prcName = "标准化活动入会流程-"; +// prcName = "标准化活动入会流程" + "会议结束"; + prcName = prcName + "流程结束"; - - - //TODO 流程结束，汇总 + //TODO 流程结束，入库 @@ -56,9 +53,7 @@ public class EngineerReviseDoneAfter implements TaskListener { 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()); @@ -85,6 +80,15 @@ public class EngineerReviseDoneAfter implements TaskListener { 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(delegateTask.getName()); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); } } } 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 33316a1c..ffed6d8c 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 @@ -14,8 +14,8 @@ public class EngineerReviseDoneBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; - + String link = "bzrhStep6?prcType=20"; +//taskInfo=标准法规工程师汇总修订完毕 IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index 84e1d731..2bf6ffe5 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 @@ -34,11 +34,11 @@ public class LeaderVerifyAfter implements TaskListener { 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 prcName = "标准化活动入会流程-"; + if("1".equals(object.getString("passFlag"))) {//通过 delegateTask.setVariable("pass3",1); @@ -50,16 +50,13 @@ public class LeaderVerifyAfter implements TaskListener { nextUserList.add(object.getString("manageDepartmentList")); } // 配置多实例 + prcName = prcName + "费用管理部门会签"; delegateTask.setVariable("manageDepartmentList", nextUserList); delegateTask.setVariable("manageDepartmentCount",nextUserList.size()); - } }else{ + prcName = prcName + "标准法规工程师汇总修订"; delegateTask.setVariable("pass3",0); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } // 存储当前节点意见 @@ -84,9 +81,7 @@ public class LeaderVerifyAfter implements TaskListener { 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()); 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 9c7a538f..22058ddd 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 @@ -14,7 +14,9 @@ public class LeaderVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; + String link = "bzrhStep6?prcType=20"; +// taskInfo=标准法规部主管领导审核 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); 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 e6a9c5bb..a48e545a 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 @@ -30,62 +30,39 @@ public class ManageSignAfter implements TaskListener { //流程信息 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 prcName = "标准化活动入会流程-"; 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; - } - } - } - idList.add(object.getString("manageDepartment")); - delegateTask.setVariable("manageIdList",idList); - if(rat == 0){ - if("1".equals(object.getString("passFlag"))) {//通过 - count = delegateTask.getVariable("managePassCount",Integer.class); - count++; - delegateTask.setVariable("managePassCount",count); - if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ - nextUserList.add(object.getString("president")); - delegateTask.setVariable("president", object.getString("president")); - delegateTask.setVariable("pass4",1); - } - - }else{ - delegateTask.setVariable("pass4",0); - delegateTask.removeVariable("manageIdList"); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } - nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); + if("1".equals(object.getString("passFlag"))) {//通过 + count = delegateTask.getVariable("managePassCount",Integer.class); + count++; + delegateTask.setVariable("managePassCount",count); + if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ + prcName = prcName + "技术委员会常务副主任/总院院长审定"; + nextUserList.add(object.getString("president")); + delegateTask.setVariable("president", object.getString("president")); + delegateTask.setVariable("managePassCount",0); + delegateTask.setVariable("pass4",1); } }else{ - throw new ActivitiException("此对象已经审批过了"); + prcName = prcName + "标准法规工程师汇总修订"; + delegateTask.setVariable("pass4",0); + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } + // 存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); @@ -106,9 +83,7 @@ public class ManageSignAfter implements TaskListener { 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()); 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 cb2b82f2..8659bb5c 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 @@ -14,8 +14,8 @@ public class ManageSignBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; - + String link = "bzrhStep6?prcType=20"; +//taskInfo=费用管理部门会签 IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index 4e677255..30257399 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 @@ -28,34 +28,28 @@ public class PresidentVerifyAfter implements TaskListener { 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 prcName = "标准化活动入会流程-"; if("1".equals(object.getString("passFlag"))) {//通过 + prcName = prcName + "标准法规工程师汇总修订完毕"; delegateTask.setVariable("pass5",1); nextUserList.add(object.getString("engineerSumDone")); delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone")); }else{ + prcName = prcName + "标准法规工程师汇总修订"; delegateTask.setVariable("pass5",0); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); - } - // 存储当前节点意见 + //存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -76,9 +70,7 @@ public class PresidentVerifyAfter implements TaskListener { 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()); 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 4154637d..0324f75a 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 @@ -14,8 +14,8 @@ public class PresidentVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; - + String link = "bzrhStep6?prcType=20"; +//taskInfo=技术委员会常务副主任 IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java index cbea2bde..dac7d739 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 @@ -42,6 +42,8 @@ public class WriteMaterialAfter implements TaskListener { List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; + // 入会申请信息重新封装 if(StringUtils.isNotBlank(object.getString("directorList"))) { @@ -52,6 +54,7 @@ public class WriteMaterialAfter implements TaskListener { } // 配置多实例 delegateTask.setVariable("directorList", nextUserList); + prcName = prcName + "技术委员会分委会主任/入会代表所在中心主任提名入会代表"; } //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); @@ -60,9 +63,7 @@ public class WriteMaterialAfter implements TaskListener { 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()); @@ -91,6 +92,7 @@ public class WriteMaterialAfter implements TaskListener { System.out.println("处理人:" + nextUser); System.out.println("流程名:" + prcName); System.out.println("节点信息:" + delegateTask.getName()); + System.out.println("节点信息2:" + delegateTask.getTaskDefinitionKey()); } } } 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 243ce174..c56f7d72 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 @@ -15,23 +15,5 @@ public class WriteMaterialBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; - 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/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index 97ce5683..aa337e28 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 @@ -42,7 +42,8 @@ public class WriteMemberInfoAfter implements TaskListener { List nextUserList = new ArrayList(); - + String prcName = "标准化活动入会流程-"; + prcName = prcName + "入会人员所在部门负责人审核"; nextUserList.add(object.getString("charge")); delegateTask.setVariable("charge",object.getString("charge")); @@ -53,9 +54,7 @@ public class WriteMemberInfoAfter implements TaskListener { 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()); 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 1e119e94..844af9b0 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 @@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; + String link = "bzrhStep3?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); From 895f27c3009f6d9d6f3430f1bdef91c4235d7bbe Mon Sep 17 00:00:00 2001 From: Kevin Date: Sat, 30 Oct 2021 19:48:34 +0800 Subject: [PATCH 03/17] =?UTF-8?q?zcr:=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=95=B4=E6=94=B9=20+=20=E5=85=A5=E4=BC=9A=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20+=20prcName=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoStartBefore.java | 2 +- .../DirectorVerifyBefore.java | 2 +- .../MemberUploadInfoBefore.java | 2 +- .../ChargeVerifyAfter.java | 93 ++++++------------- .../ChargeVerifyBefore.java | 2 +- .../DirectorChooseAfter.java | 58 ++++-------- .../DirectorChooseBefore.java | 2 +- .../EngineerReviseAfter.java | 5 +- .../EngineerReviseBefore.java | 2 +- .../EngineerReviseDoneAfter.java | 6 +- .../EngineerReviseDoneBefore.java | 2 +- .../LeaderVerifyAfter.java | 14 +-- .../LeaderVerifyBefore.java | 2 +- .../StandardMeetProcess/ManageSignAfter.java | 50 +++------- .../StandardMeetProcess/ManageSignBefore.java | 2 +- .../PresidentVerifyAfter.java | 14 +-- .../PresidentVerifyBefore.java | 2 +- .../WriteMaterialAfter.java | 5 +- .../WriteMaterialBefore.java | 2 +- .../WriteMemberInfoAfter.java | 11 +-- .../WriteMemberInfoBefore.java | 2 +- .../ChargeVerifyAfter.java | 67 ++++++------- .../DirectorChooseAfter.java | 40 ++++---- .../EngineerReviseAfter.java | 6 +- .../EngineerReviseDoneAfter.java | 2 +- .../LeaderVerifyAfter.java | 4 +- .../ManageSignAfter.java | 5 +- .../PresidentVerifyAfter.java | 4 +- .../WriteMemberInfoAfter.java | 5 - 29 files changed, 144 insertions(+), 269 deletions(-) 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 index 2584f77b..500581c4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java @@ -14,7 +14,7 @@ public class AutoStartBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=22"; + String link = "bzhhStep?prcType=22"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 index f70ca5ab..36da681e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java @@ -14,7 +14,7 @@ public class DirectorVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=22"; + String link = "bzhhStep?prcType=22"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 index f883cb31..c9647980 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java @@ -14,7 +14,7 @@ public class MemberUploadInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=22"; + String link = "bzhhStep?prcType=22"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 9d926704..32299470 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 @@ -30,89 +30,57 @@ public class ChargeVerifyAfter implements TaskListener { 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 prcName = "标准化活动参会流程-"; JSONObject sum = new JSONObject(); if(null == delegateTask.getVariable("membersSumJSON")){ delegateTask.setVariable("membersSumJSON",sum); } - - 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("1".equals(object.getString("passFlag"))){//通过 + JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); + if(sum.isEmpty()){ + sum = object; + delegateTask.setVariable("membersSumJSON",sum); + }else { + JSONObject o1 = sum.getJSONObject("rh_pageData"); + JSONObject o = os.getJSONObject(0); + JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + os1.add(o); + o1.put("myPartRole",os1); + sum.put("rh_pageData",o1); + delegateTask.setVariable("membersSumJSON",sum); } - } - if(rat == 0){ - if("1".equals(object.getString("passFlag"))){//通过 - - JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); - if(sum.isEmpty()){ - sum = object; - delegateTask.setVariable("membersSumJSON",sum); - }else { - JSONObject o1 = sum.getJSONObject("rh_pageData"); - JSONObject o = os.getJSONObject(0); - JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - os1.add(o); - o1.put("myPartRole",os1); - sum.put("rh_pageData",o1); - delegateTask.setVariable("membersSumJSON",sum); + count = delegateTask.getVariable("chargePassCount",Integer.class); + delegateTask.setVariable("chargePassCount",count + 1); + delegateTask.setVariable("pass2",1);//排他通道 + System.out.println(delegateTask.getVariable("chargePassList")); + if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ + prcName = prcName + "标准法规工程师修订"; + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", object.getString("engineerSum")); } - - 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", object.getString("engineerSum")); - } - } - }else{ - delegateTask.setVariable("pass2",0);//排他通道 - nextUserList.add(object.getString("member")); } }else{ - throw new ActivitiException("审批过了"); + prcName = prcName + "参会代表填写参会信息表"; + delegateTask.setVariable("pass2",0);//排他通道 + nextUserList.add(object.getString("member")); } + // 存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); @@ -127,8 +95,6 @@ public class ChargeVerifyAfter implements TaskListener { } } - - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); @@ -136,7 +102,6 @@ public class ChargeVerifyAfter implements TaskListener { 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()); 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 45c4e771..00df1e02 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 @@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); 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 c5358f64..d82b3d03 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 @@ -30,59 +30,42 @@ public class DirectorChooseAfter implements TaskListener { //流程信息 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); } + String prcName = "标准化活动参会流程-"; - //防止重复审批同一对象 - List idList = new ArrayList<>(); - if(null == delegateTask.getVariable("memberIdList")){ - delegateTask.setVariable("memberIdList", idList); + //全员不通过，检测条件 directorCount + //TODO 1全员不通过,2会后需要多实例吗? + Integer allCount = delegateTask.getVariable("directorList",List.class).size();; + Integer count = 0; + if(null == delegateTask.getVariable("directorCount")){ + delegateTask.setVariable("directorCount", count); } - int rat = 0; - idList = delegateTask.getVariable("memberIdList",List.class); - if(!idList.isEmpty()){ - for(String a : idList){ - if(a.equals(object.getString("memberId"))){ - rat = 1; - break; - } - } - } - idList.add(object.getString("memberId")); - delegateTask.setVariable("memberIdList",idList); + count = delegateTask.getVariable("directorCount",Integer.class); + delegateTask.setVariable("directorCount",count+1); - if(rat == 0){ - 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); - } - delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); - }else{ - //TODO 如果所有人未通过，则结束流程 + if("1".equals(object.getString("passFlag"))) { + prcName = prcName + "参会代表填写参会信息表"; + 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); } - }else{ - throw new ActivitiException("此对象已经审批过了"); + delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); } @@ -106,7 +89,6 @@ public class DirectorChooseAfter implements TaskListener { 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()); 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 ccad914f..edf1b148 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 @@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 495dd672..b596c261 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 @@ -26,16 +26,16 @@ public class EngineerReviseAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.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 prcName = "标准化活动参会流程-"; + prcName = prcName + "技术管理中心主任审批"; nextUserList.add(object.getString("leader")); delegateTask.setVariable("leader", object.getString("leader")); @@ -46,7 +46,6 @@ public class EngineerReviseAfter implements TaskListener { 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()); 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 a1403a34..e203b821 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 @@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 5604b11a..2ac661bb 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 @@ -38,7 +38,9 @@ public class EngineerReviseDoneAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - + String prcName = "标准化活动参会流程-"; +// prcName = "标准化活动参会流程-" + "会议结束"; + prcName = prcName + "流程结束"; //TODO 流程结束，汇总 @@ -50,7 +52,6 @@ public class EngineerReviseDoneAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; prcName = "标准化活动参会流程"; @@ -86,7 +87,6 @@ public class EngineerReviseDoneAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - prcName = "标准化活动参会流程" + "会议结束"; busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } 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 f054da16..6485c216 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 @@ -14,7 +14,7 @@ public class EngineerReviseDoneBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 2097410b..88374852 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 @@ -29,19 +29,15 @@ public class LeaderVerifyAfter implements TaskListener { 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 prcName = "标准化活动参会流程-"; if("1".equals(object.getString("passFlag"))) {//通过 delegateTask.setVariable("pass3",1); if(StringUtils.isNotBlank(object.getString("manageDepartmentList"))) { @@ -54,15 +50,12 @@ public class LeaderVerifyAfter implements TaskListener { // 配置多实例 delegateTask.setVariable("manageDepartmentList", nextUserList); delegateTask.setVariable("manageDepartmentCount",nextUserList.size()); - + prcName = prcName + "费用管理部门会签"; } }else{ delegateTask.setVariable("pass3",0); nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } + prcName = prcName + "标准法规工程师修订"; } // 存储当前节点意见 if (null != object.getString("commentText")) { @@ -86,7 +79,6 @@ public class LeaderVerifyAfter implements TaskListener { 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()); 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 d3f917f6..c7856218 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 @@ -14,7 +14,7 @@ public class LeaderVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 283bfcf6..23cb4f60 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 @@ -37,47 +37,26 @@ public class ManageSignAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - - + String prcName = "标准化活动参会流程-"; 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; - } - } - } - idList.add(object.getString("manageDepartment")); - delegateTask.setVariable("manageIdList",idList); - if(rat == 0){ - if("1".equals(object.getString("passFlag"))) {//通过 - count = delegateTask.getVariable("managePassCount",Integer.class); - count++; - delegateTask.setVariable("managePassCount",count); - if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ - nextUserList.add(object.getString("president")); - delegateTask.setVariable("president", object.getString("president")); - delegateTask.setVariable("pass4",1); - } - - }else{ - delegateTask.setVariable("pass4",0); - nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); + if("1".equals(object.getString("passFlag"))) {//通过 + count = delegateTask.getVariable("managePassCount",Integer.class); + count++; + delegateTask.setVariable("managePassCount",count); + if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ + prcName = prcName + "技术委员会常务副主任/总院院长审定"; + nextUserList.add(object.getString("president")); + delegateTask.setVariable("managePassCount",0); + delegateTask.setVariable("president", object.getString("president")); + delegateTask.setVariable("pass4",1); } }else{ - throw new ActivitiException("此对象已经审批过了"); + prcName = prcName + "标准法规工程师修订"; + delegateTask.setVariable("pass4",0); + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } // 存储当前节点意见 if (null != object.getString("commentText")) { @@ -101,7 +80,6 @@ public class ManageSignAfter implements TaskListener { 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()); 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 c33e641a..6c7e3488 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 @@ -14,7 +14,7 @@ public class ManageSignBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 046658d3..fa53a424 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 @@ -28,30 +28,23 @@ public class PresidentVerifyAfter implements TaskListener { 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 prcName = "标准化活动参会流程-"; if("1".equals(object.getString("passFlag"))) {//通过 + prcName = prcName + "标准法规工程师修订完毕"; delegateTask.setVariable("pass5",1); nextUserList.add(object.getString("engineerSumDone")); delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone")); }else{ + prcName = prcName + "标准法规工程师修订"; delegateTask.setVariable("pass5",0); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } // 存储当前节点意见 @@ -75,7 +68,6 @@ public class PresidentVerifyAfter implements TaskListener { 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()); 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 8bad174b..ca637a9d 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 @@ -14,7 +14,7 @@ public class PresidentVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 d8e99853..7c2ea60a 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 @@ -41,7 +41,7 @@ public class WriteMaterialAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - + String prcName = "标准化活动参会流程-"; // 入会申请信息重新封装 if(StringUtils.isNotBlank(object.getString("directorList"))) { @@ -52,6 +52,7 @@ public class WriteMaterialAfter implements TaskListener { } // 配置多实例 delegateTask.setVariable("directorList", nextUserList); + prcName = prcName + "分委会主任/部门中心主任提名入会代表"; } //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); @@ -60,7 +61,7 @@ public class WriteMaterialAfter implements TaskListener { 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()); 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 54d2f747..91e65bf8 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 @@ -15,7 +15,7 @@ public class WriteMaterialBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 42b37ff1..c29ae72b 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 @@ -29,25 +29,19 @@ public class WriteMemberInfoAfter implements TaskListener { 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 prcName = "标准化活动参会流程-"; + prcName = prcName + "参会人员所在部门中心主任审核"; nextUserList.add(object.getString("charge")); delegateTask.setVariable("charge", object.getString("charge")); - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); @@ -55,7 +49,6 @@ public class WriteMemberInfoAfter implements TaskListener { 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()); 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 3c0d550d..33c732b8 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 @@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index d22e6ae1..713b8569 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 @@ -32,65 +32,53 @@ public class ChargeVerifyAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.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 prcName = "标准化活动入会流程-"; + String prcName = "标准化活动入会流程-"; JSONObject sum = new JSONObject(); if(null == delegateTask.getVariable("membersSumJSON")){ delegateTask.setVariable("membersSumJSON",sum); } - - Integer count = 0; if(null == delegateTask.getVariable("chargePassCount")){ delegateTask.setVariable("chargePassCount",count); } - - - - if("1".equals(object.getString("passFlag"))){//通过 - - JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); - if(sum.isEmpty()){ - sum = object; - delegateTask.setVariable("membersSumJSON",sum); - }else { - JSONObject o1 = sum.getJSONObject("rh_pageData"); - JSONObject o = os.getJSONObject(0); - JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - os1.add(o); - o1.put("myPartRole",os1); - sum.put("rh_pageData",o1); - delegateTask.setVariable("membersSumJSON",sum); + if("1".equals(object.getString("passFlag"))){//通过 + JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); + if(sum.isEmpty()){ + sum = object; + delegateTask.setVariable("membersSumJSON",sum); + }else { + JSONObject o1 = sum.getJSONObject("rh_pageData"); + JSONObject o = os.getJSONObject(0); + JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + os1.add(o); + o1.put("myPartRole",os1); + sum.put("rh_pageData",o1); + delegateTask.setVariable("membersSumJSON",sum); + } + count = delegateTask.getVariable("chargePassCount",Integer.class); + delegateTask.setVariable("chargePassCount",count + 1); + delegateTask.setVariable("pass2",1);//排他通道 + if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ + prcName = prcName + "标准法规工程师汇总修订"; + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", object.getString("engineerSum")); } - - - count = delegateTask.getVariable("chargePassCount",Integer.class); - delegateTask.setVariable("chargePassCount",count + 1); - delegateTask.setVariable("pass2",1);//排他通道 - - if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ - prcName = prcName + "标准法规工程师汇总修订"; - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", object.getString("engineerSum")); - } - } - }else{ + } + }else{ prcName = prcName + "入会代表填写入会信息表"; delegateTask.setVariable("pass2",0);//排他通道 nextUserList.add(object.getString("member")); - } + } // 存储当前节点意见 if (null != object.getString("commentText")) { @@ -107,7 +95,6 @@ public class ChargeVerifyAfter implements TaskListener { } - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); 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 25ce0f64..b2c3df50 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 @@ -32,37 +32,39 @@ public class DirectorChooseAfter implements TaskListener { 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 prcName = "标准化活动入会流程-"; + + String prcName = "标准化活动入会流程-"; //如果 他是通过 passFlag==1 List passMemberList = new ArrayList<>(); if(null == delegateTask.getVariable("memberList")){ delegateTask.setVariable("memberList", passMemberList); } + //全员不通过，检测条件 directorCount + Integer allCount = delegateTask.getVariable("directorList",List.class).size();; + Integer count = 0; + if(null == delegateTask.getVariable("directorCount")){ + delegateTask.setVariable("directorCount", count); + } + count = delegateTask.getVariable("directorCount",Integer.class); + delegateTask.setVariable("directorCount",count+1); - if("1".equals(object.getString("passFlag"))) { - prcName = prcName + "入会代表填写入会信息表"; - 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()); + if("1".equals(object.getString("passFlag"))) { + prcName = prcName + "入会代表填写入会信息表"; + 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); } - - if(delegateTask.getVariable("memberCount",Integer.class).equals(0)){ - throw new ActivitiException("所有人不涉及入会，流程终止"); - } - + delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); + } // 存储当前节点意见 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index 3d3f46cd..b28a90cc 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 @@ -28,18 +28,14 @@ public class EngineerReviseAfter implements TaskListener { 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 prcName = "标准化活动入会流程-"; prcName = prcName + "标准法规部主管领导审核"; nextUserList.add(object.getString("leader")); 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 5b301984..7e027b4d 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 @@ -38,7 +38,7 @@ public class EngineerReviseDoneAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); String prcName = "标准化活动入会流程-"; -// prcName = "标准化活动入会流程" + "会议结束"; +// prcName = "标准化活动入会流程-" + "会议结束"; prcName = prcName + "流程结束"; //TODO 流程结束，入库 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index 2bf6ffe5..a3ca73a5 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 @@ -29,7 +29,6 @@ public class LeaderVerifyAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -37,9 +36,8 @@ public class LeaderVerifyAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; - - if("1".equals(object.getString("passFlag"))) {//通过 delegateTask.setVariable("pass3",1); if(StringUtils.isNotBlank(object.getString("manageDepartmentList"))) { 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 a48e545a..d8e53aad 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 @@ -36,16 +36,13 @@ public class ManageSignAfter implements TaskListener { Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - - - List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; Integer count = 0; if(null == delegateTask.getVariable("managePassCount")){ delegateTask.setVariable("managePassCount",count); } - if("1".equals(object.getString("passFlag"))) {//通过 count = delegateTask.getVariable("managePassCount",Integer.class); count++; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index 30257399..5b551e2c 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 @@ -28,16 +28,14 @@ public class PresidentVerifyAfter implements TaskListener { 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 prcName = "标准化活动入会流程-"; if("1".equals(object.getString("passFlag"))) {//通过 prcName = prcName + "标准法规工程师汇总修订完毕"; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index aa337e28..85d15ddd 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 @@ -29,17 +29,12 @@ public class WriteMemberInfoAfter implements TaskListener { 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 prcName = "标准化活动入会流程-"; From 16814c6fc6c20e9c5f745046bee00306f016fdea Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Mon, 1 Nov 2021 14:10:23 +0800 Subject: [PATCH 04/17] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JoinStandardFiling/JSFApproveAfter.java | 43 +++++----- .../JoinStandardFiling/JSFAuditAfter.java | 32 +++----- .../JSFFillinformationAfter.java | 7 +- .../JoinStandardFiling/JSFstartAfter.java | 5 +- .../PRFApproveAfter.java | 43 +++++----- .../PRFEngineerreviewAfter.java | 25 ++---- .../PRFFillinformationAfter.java | 81 +++++++++++-------- .../PRFReviewdockAfter.java | 23 ++---- .../PRFUnderengineerAfter.java | 11 ++- .../PRFstartAfter.java | 9 ++- .../RecommendedApproval/RAApproveAfter.java | 44 +++++----- .../RecommendedApproval/RAAuditAfter.java | 29 ++----- .../RAModifyInformationAfter.java | 8 +- .../RecommendedApproval/RASignAfter.java | 29 ++----- .../RAValidationAfter.java | 33 ++------ .../RecommendedApproval/RAstartAfter.java | 18 +++-- 16 files changed, 194 insertions(+), 246 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java index 22f14184..b59abcb7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java @@ -36,11 +36,15 @@ public class JSFApproveAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); + List nextUserList = new ArrayList(); + String approvalOpinion = object.get("bzFlag") == null ? "" : object.get("bzFlag").toString(); if ("1".equalsIgnoreCase(approvalOpinion)) { - delegateTask.setVariable("Standardizer2", object.getString("Standardizer2User")); + delegateTask.setVariable("bzFlag", 1); + func1(delegateTask, busBean, object, "1", busProcessNameService); + } else { BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -48,41 +52,38 @@ public class JSFApproveAfter implements TaskListener { busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("Standardizer2User")); - busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busProcessNew.setUserId(object.getString("passUser")); + busProcessNew.setPrcName("加入标准化协会信息备案-修改入会信息"); busBean.save(busProcessNew); - - func1(delegateTask, busBean, object, "1"); + func2(delegateTask, busBean, object, "0"); delegateTask.setVariable("bzFlag", 2); - } else { - delegateTask.setVariable("bzFlag", 1); - func2(delegateTask, busBean, object, "0", busProcessNameService); + delegateTask.setVariable("statuteengineer",delegateTask.getVariable("prcCreateUser",String.class)); } } - private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { - QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("TASK_ID", delegateTask.getId()); - BusProcessNew one1 = busBean.getOne(queryWrapper1); - if (one1 != null) { - one1.setCommitFlag(commitFlag); - one1.setCommitText(object.getString("commentText")); - busBean.saveOrUpdate(one1); - } - } - - private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); if (one2 != null) { - //one2.setPrcName("入库流程结束"); +// one2.setPrcName("入库流程结束"); one2.setOverTime(OVERTIME); one2.setPrcType("1"); busProcessNameService.saveOrUpdate(one2); } + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setPrcName("加入标准化协会信息备案-入库流程结束"); + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java index f612e18d..869acb21 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java @@ -38,34 +38,22 @@ public class JSFAuditAfter implements TaskListener { if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("gcsFlag", 1); - if (StringUtils.isNotBlank(object.getString("statuteministerUser"))) { - - if (object.getString("statuteministerUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("statuteministerUser").split(",")); - } else { - nextUserList.add(object.getString("statuteministerUser")); - } - } + delegateTask.setVariable("statuteminister",delegateTask.getVariable("statuteminister1",String.class)); + nextUserList.add(delegateTask.getVariable("statuteminister1",String.class)); } else { - delegateTask.setVariable("gcsFlag", 2); - if (StringUtils.isNotBlank(object.getString("dockUser"))) { - delegateTask.setVariable("Standardizer2", object.getString("dockUser")); - nextUserList.add(object.getString("dockUser")); - } + delegateTask.setVariable("gcsFlag", 0); + delegateTask.setVariable("Standardizer2",delegateTask.getVariable("Standardizer1",String.class)); + nextUserList.add(delegateTask.getVariable("Standardizer1",String.class)); } //截止时间 流程描述 创建人 - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("prcCreateUser", user); - delegateTask.setVariable("prcCreateUserName", username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); - String prcName=""; + String user = delegateTask.getVariable("prcCreateUser", String.class); + String username = delegateTask.getVariable("prcCreateUserName",String.class); + String prcName; if(object.getString("signFlag").equals("1")) { - prcName = "-加入标准化协会信息备案-批准"; + prcName = "加入标准化协会信息备案-批准"; }else { - prcName = "-加入标准化协会信息备案-填写入会信息"; + prcName = "加入标准化协会信息备案-修改入会信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java index 8351933c..37423642 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java @@ -41,6 +41,7 @@ public class JSFFillinformationAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); + String approvalOpinion = object.get("dlFlag") == null ? "" : object.get("dlFlag").toString(); if ("1".equalsIgnoreCase(approvalOpinion)) { @@ -53,11 +54,12 @@ public class JSFFillinformationAfter implements TaskListener { busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNew.setUserId(object.getString("passUser")); - busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busProcessNew.setPrcName("加入标准化协会信息备案-标准法规工程师审核"); busBean.save(busProcessNew); func1(delegateTask, busBean, object, "1"); delegateTask.setVariable("dlFlag", 1); + delegateTask.setVariable("statuteengineer",delegateTask.getVariable("prcCreateUser",String.class)); } else { delegateTask.setVariable("dlFlag", 0); func2(delegateTask, busBean, object, "0", busProcessNameService); @@ -81,7 +83,7 @@ public class JSFFillinformationAfter implements TaskListener { BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); if (one2 != null) { - //one2.setPrcName("入库流程结束"); +// one2.setPrcName("入库流程结束"); one2.setOverTime(OVERTIME); one2.setPrcType("1"); busProcessNameService.saveOrUpdate(one2); @@ -91,6 +93,7 @@ public class JSFFillinformationAfter implements TaskListener { queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); if (one1 != null) { + one1.setPrcName("加入标准化协会信息备案-流程结束"); one1.setCommitFlag(commitFlag); one1.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java index 04625532..8bf72c52 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java @@ -44,7 +44,10 @@ public class JSFstartAfter implements TaskListener { // 配置多实例 delegateTask.setVariable("Standardizer2list",nextUserList); - delegateTask.setVariable("Standardizer2", object.getString("dockUser")); + delegateTask.setVariable("Standardizer1", object.getString("dockUser")); + delegateTask.setVariable("statuteengineer1", object.getString("passUser")); + delegateTask.setVariable("statuteminister1", object.getString("directorUser")); + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java index ff7b7501..aa466e21 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java @@ -32,11 +32,13 @@ public class PRFApproveAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); + String approvalOpinion = object.get("bzFlag") == null ? "" : object.get("bzFlag").toString(); if ("1".equalsIgnoreCase(approvalOpinion)) { - delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); + delegateTask.setVariable("bzFlag", 1); + func1(delegateTask, busBean, object, "1", busProcessNameService); + } else { BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -44,41 +46,38 @@ public class PRFApproveAfter implements TaskListener { busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("LiabilityengineerUser")); - busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busProcessNew.setUserId(object.getString("sonUser")); + busProcessNew.setPrcName("参与外部标准制修订备案-修改入会信息"); busBean.save(busProcessNew); - - func1(delegateTask, busBean, object, "1"); + func2(delegateTask, busBean, object, "0"); delegateTask.setVariable("bzFlag", 2); - } else { - delegateTask.setVariable("bzFlag", 1); - func2(delegateTask, busBean, object, "0", busProcessNameService); + delegateTask.setVariable("Liabilityengineer",delegateTask.getVariable("Liabilityengineer1",String.class)); } } - private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { - QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("TASK_ID", delegateTask.getId()); - BusProcessNew one1 = busBean.getOne(queryWrapper1); - if (one1 != null) { - one1.setCommitFlag(commitFlag); - one1.setCommitText(object.getString("commentText")); - busBean.saveOrUpdate(one1); - } - } - - private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); if (one2 != null) { - one2.setPrcName("入库流程结束"); +// one2.setPrcName("入库流程结束"); one2.setOverTime(OVERTIME); one2.setPrcType("1"); busProcessNameService.saveOrUpdate(one2); } + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setPrcName("参与外部标准制修订备案-入库流程结束"); + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java index 30d27127..1a00c702 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java @@ -35,30 +35,15 @@ public class PRFEngineerreviewAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("statuteminister", object.getString("statuteministerUser")); - nextUserList.add(object.getString("statuteministerUser")); - delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); - nextUserList.add(object.getString("LiabilityengineerUser")); - -// 逻辑判断是否会签 signFlag if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("gcsFlag", 1); - if (StringUtils.isNotBlank(object.getString("statuteministerUser"))) { - - if (object.getString("statuteministerUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("statuteministerUser").split(",")); - } else { - nextUserList.add(object.getString("statuteministerUser")); - } - } + delegateTask.setVariable("statuteminister",delegateTask.getVariable("statuteminister1",String.class)); + nextUserList.add(delegateTask.getVariable("statuteminister1",String.class)); } else { delegateTask.setVariable("gcsFlag", 2); - if (StringUtils.isNotBlank(object.getString("LiabilityengineerUser"))) { - delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); - nextUserList.add(object.getString("LiabilityengineerUser")); - } + delegateTask.setVariable("Liabilityengineer",delegateTask.getVariable("Liabilityengineer1",String.class)); + nextUserList.add(delegateTask.getVariable("Liabilityengineer1",String.class)); } //截止时间 流程描述 创建人 @@ -72,7 +57,7 @@ public class PRFEngineerreviewAfter implements TaskListener { if(object.getString("signFlag").equals("1")) { prcName = standName + "-参与外部标准制修订备案-部长批准"; }else { - prcName = standName + "-参与外部标准制修订备案-填写备案信息"; + prcName = standName + "-参与外部标准制修订备案-修改备案信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java index 3d61c3cd..92c25931 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java @@ -12,7 +12,9 @@ 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; public class PRFFillinformationAfter implements TaskListener { @@ -32,46 +34,61 @@ public class PRFFillinformationAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("Buttpeople2", object.getString("Buttpeople2User")); - nextUserList.add(object.getString("Buttpeople2User")); + String approvalOpinion = object.get("dlFlag") == null ? "" : object.get("dlFlag").toString(); + if ("1".equalsIgnoreCase(approvalOpinion)) { - //截止时间 流程描述 创建人 - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("prcCreateUser", user); - delegateTask.setVariable("prcCreateUserName", username); -// delegateTask.setVariable("stId",object.getString("projectNumber")); + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busProcessNew.setUserId(object.getString("passUser")); + busProcessNew.setPrcName("参与外部标准制修订备案-责任部门对接人审核"); + busBean.save(busProcessNew); - String prcName = delegateTask.getVariable("listName", String.class) + "-参与外部标准制修订备案-对接人审核"; + func1(delegateTask, busBean, object, "1"); + delegateTask.setVariable("dlFlag", 1); + delegateTask.setVariable("Buttpeople2",delegateTask.getVariable("Buttpeople3",String.class)); + } else { + delegateTask.setVariable("dlFlag", 2); + func2(delegateTask, busBean, object, "0", busProcessNameService); + } + } + + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); - BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); - - if(one1!=null){ - one1.setPrcType("14"); - one1.setPrcName(prcName); - one1.setCreatUser(user); - one1.setCreatUserName(username); - busProcessNameService.saveOrUpdate(one1); + BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + if (one2 != null) { + one2.setOverTime(OVERTIME); + one2.setPrcType("1"); + busProcessNameService.saveOrUpdate(one2); } - 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); - } + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setPrcName("参与外部标准制修订备案-流程结束"); + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java index 650a95d9..42c889ae 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java @@ -35,28 +35,15 @@ public class PRFReviewdockAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("statuteengineer", object.getString("statuteengi6neerUser")); - nextUserList.add(object.getString("statuteengineerUser")); - delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); - nextUserList.add(object.getString("LiabilityengineerUser")); if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("djrFlag", 1); - if (StringUtils.isNotBlank(object.getString("statuteengineerUser"))) { - - if (object.getString("statuteengineerUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("statuteengineerUser").split(",")); - } else { - nextUserList.add(object.getString("statuteengineerUser")); - } - } + delegateTask.setVariable("statuteengineer",delegateTask.getVariable("statuteengineer1",String.class)); + nextUserList.add(delegateTask.getVariable("statuteengineer1",String.class)); } else { delegateTask.setVariable("djrFlag", 2); - if (StringUtils.isNotBlank(object.getString("LiabilityengineerUser"))) { - delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); - nextUserList.add(object.getString("LiabilityengineerUser")); - } + delegateTask.setVariable("Liabilityengineer",delegateTask.getVariable("Liabilityengineer1",String.class)); + nextUserList.add(delegateTask.getVariable("Liabilityengineer1",String.class)); } //截止时间 流程描述 创建人 @@ -70,7 +57,7 @@ public class PRFReviewdockAfter implements TaskListener { if(object.getString("signFlag").equals("1")) { prcName = standName + "-参与外部标准制修订备案-工程师审核"; }else { - prcName = standName + "-参与外部标准制修订备案-填写备案信息"; + prcName = standName + "-参与外部标准制修订备案-修改备案信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java index 05946437..72a84b3c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java @@ -13,6 +13,7 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class PRFUnderengineerAfter implements TaskListener { @@ -33,13 +34,15 @@ public class PRFUnderengineerAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); + String ids=object.getString("sonUser"); + if(ids.contains(",")){ + nextUserList=new ArrayList<>(Arrays.asList(ids.split(","))); + }else { + nextUserList.add(ids); + } // 配置多实例 delegateTask.setVariable("Liabilityengineerlist",nextUserList); -// 赋值 - delegateTask.setVariable("Liabilityengineer", object.getString("sonUser")); - nextUserList.add(object.getString("sonUser")); - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java index 6e0aefe4..ab4313db 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java @@ -40,17 +40,22 @@ public class PRFstartAfter implements TaskListener { }else { nextUserList.add(ids); } + // 配置多实例 delegateTask.setVariable("Buttpeoplelist",nextUserList); + delegateTask.setVariable("Buttpeople3", object.getString("passUser")); + delegateTask.setVariable("Liabilityengineer1", object.getString("sonUser")); + delegateTask.setVariable("statuteengineer1", object.getString("statuteengineerUser")); + delegateTask.setVariable("statuteminister1", object.getString("statuteministerUser")); + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); -// delegateTask.setVariable("stId",object.getString("projectNumber")); - String prcName = delegateTask.getVariable("listName", String.class) + "-参与外部标准制修订备案-备案任务下发"; + String prcName = "参与外部标准制修订备案-备案任务下发"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java index e3a7a1c1..4111278e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java @@ -43,10 +43,13 @@ public class RAApproveAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); + String approvalOpinion = object.get("yzFlag") == null ? "" : object.get("yzFlag").toString(); if ("1".equalsIgnoreCase(approvalOpinion)) { - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); + delegateTask.setVariable("yzFlag", 1); + func1(delegateTask, busBean, object, "1", busProcessNameService); + + } else { BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -54,41 +57,38 @@ public class RAApproveAfter implements TaskListener { busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("prcCreateUser")); - busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busProcessNew.setUserId(object.getJSONObject("roleForm").getString("passUser")); + busProcessNew.setPrcName("外部署名推荐批准-修改信息"); busBean.save(busProcessNew); - - func1(delegateTask, busBean, object, "1"); + func2(delegateTask, busBean, object, "0"); delegateTask.setVariable("yzFlag", 2); - } else { - delegateTask.setVariable("yzFlag", 1); - func2(delegateTask, busBean, object, "0", busProcessNameService); + delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class)); } } - private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { - QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("TASK_ID", delegateTask.getId()); - BusProcessNew one1 = busBean.getOne(queryWrapper1); - if (one1 != null) { - one1.setCommitFlag(commitFlag); - one1.setCommitText(object.getString("commentText")); - busBean.saveOrUpdate(one1); - } - } - - private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); if (one2 != null) { - one2.setPrcName("入库流程结束"); +// one2.setPrcName("入库流程结束"); one2.setOverTime(OVERTIME); one2.setPrcType("1"); busProcessNameService.saveOrUpdate(one2); } + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setPrcName("外部署名推荐批准-入库流程结束"); + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java index 75578a70..40c2e9fa 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java @@ -43,30 +43,15 @@ public class RAAuditAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("director", object.getString("directorUser")); - nextUserList.add(object.getString("directorUser")); - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); - -// 逻辑判断 signFlag if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("bzFlag", 1); - if (StringUtils.isNotBlank(object.getString("directorUser"))) { - - if (object.getString("directorUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("directorUser").split(",")); - } else { - nextUserList.add(object.getString("directorUser")); - } - } + delegateTask.setVariable("director",delegateTask.getVariable("director1",String.class)); + nextUserList.add(delegateTask.getVariable("director1",String.class)); } else { delegateTask.setVariable("bzFlag", 2); - if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) { - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); - } + delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class)); + nextUserList.add(delegateTask.getVariable("statuteengineer3",String.class)); } //截止时间 流程描述 创建人 @@ -74,13 +59,11 @@ public class RAAuditAfter implements TaskListener { String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); String prcName=""; if(object.getString("signFlag").equals("1")) { - prcName = standName + "-外部署名推荐批准-审核"; + prcName = "外部署名推荐批准-审核"; }else { - prcName = standName + "-外部署名推荐批准-修改信息"; + prcName = "外部署名推荐批准-修改信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java index 72420410..13229507 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java @@ -43,11 +43,9 @@ public class RAModifyInformationAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("leadership", object.getString("dockUser")); - nextUserList.add(object.getString("dockUser")); - + delegateTask.setVariable("leadership",delegateTask.getVariable("leadership1",String.class)); + nextUserList.add(delegateTask.getVariable("leadership1",String.class)); //截止时间 流程描述 创建人 @@ -56,7 +54,7 @@ public class RAModifyInformationAfter implements TaskListener { delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String prcName = delegateTask.getVariable("listName", String.class) + "-外部署名推荐批准-署名领导会签"; + String prcName = "外部署名推荐批准-署名领导会签"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java index f725c571..8aadfbe9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java @@ -43,28 +43,15 @@ public class RASignAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("statuteminister", object.getString("ministerUser")); - nextUserList.add(object.getString("ministerUser")); - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("ldFlag", 1); - if (StringUtils.isNotBlank(object.getString("ministerUser"))) { - - if (object.getString("ministerUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("ministerUser").split(",")); - } else { - nextUserList.add(object.getString("ministerUser")); - } - } + delegateTask.setVariable("statuteminister",delegateTask.getVariable("statuteminister1",String.class)); + nextUserList.add(delegateTask.getVariable("statuteminister1",String.class)); } else { - delegateTask.setVariable("ldFlag", 2); - if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) { - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); - } + delegateTask.setVariable("ldFlag", 2); + delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class)); + nextUserList.add(delegateTask.getVariable("statuteengineer3",String.class)); } //截止时间 流程描述 创建人 @@ -72,13 +59,11 @@ public class RASignAfter implements TaskListener { String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); String prcName=""; if(object.getString("signFlag").equals("1")) { - prcName = standName + "-外部署名推荐批准-审核"; + prcName = "外部署名推荐批准-审核"; }else { - prcName = standName + "-外部署名推荐批准-修改信息"; + prcName = "外部署名推荐批准-修改信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java index afa5b5e5..79be14a2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java @@ -44,31 +44,15 @@ public class RAValidationAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("dean", object.getString("president")); - nextUserList.add(object.getString("president")); - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); - -// 逻辑判断是否审核 signFlag if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("zrFlag", 1); - - if (StringUtils.isNotBlank(object.getString("president"))) { - - if (object.getString("president").contains(",")) { - nextUserList = Arrays.asList(object.getString("president").split(",")); - } else { - nextUserList.add(object.getString("president")); - } - } + delegateTask.setVariable("dean",delegateTask.getVariable("dean1",String.class)); + nextUserList.add(delegateTask.getVariable("dean1",String.class)); } else { delegateTask.setVariable("zrFlag", 2); - if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) { - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); - } + delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class)); + nextUserList.add(delegateTask.getVariable("statuteengineer3",String.class)); } //截止时间 流程描述 创建人 @@ -76,13 +60,12 @@ public class RAValidationAfter implements TaskListener { String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); - String prcName=""; + + String prcName; if(object.getString("signFlag").equals("1")) { - prcName = standName + "-外部署名推荐批准-批准"; + prcName = "外部署名推荐批准-批准"; }else { - prcName = standName + "-外部署名推荐批准-修改信息"; + prcName = "外部署名推荐批准-修改信息"; } QueryWrapper queryWrapper2 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java index ad69ddd7..e3749a83 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java @@ -42,23 +42,31 @@ public class RAstartAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); + List nextUserList = new ArrayList(); + String ids= object.getJSONObject("roleForm").getString("dockUser"); + if(ids.contains(",")){ + nextUserList=new ArrayList<>(Arrays.asList(ids.split(","))); + }else { + nextUserList.add(ids); + } // 配置多实例 delegateTask.setVariable("leadershiplist",nextUserList); // 赋值 - delegateTask.setVariable("leadership", object.getString("dockUser")); - nextUserList.add(object.getString("dockUser")); - + delegateTask.setVariable("leadership1", object.getJSONObject("roleForm").getString("dockUser")); + delegateTask.setVariable("director1", object.getJSONObject("roleForm").getString("directorUser")); + delegateTask.setVariable("statuteminister1", object.getJSONObject("roleForm").getString("ministerUser")); + delegateTask.setVariable("dean1", object.getJSONObject("roleForm").getString("president")); + delegateTask.setVariable("statuteengineer3", object.getJSONObject("roleForm").getString("passUser")); //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); -// delegateTask.setVariable("stId",object.getString("projectNumber")); - String prcName = delegateTask.getVariable("listName", String.class) + "-外部署名推荐批准-署名领导会签"; + String prcName = "外部署名推荐批准-署名领导会签"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); From f6005816c30c47dc034937a477090e9cc8dc437c Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 1 Nov 2021 14:25:08 +0800 Subject: [PATCH 05/17] =?UTF-8?q?zcr:=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=8F=82=E4=BC=9A=20=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoStartAfter.java | 8 ++--- .../AutoStartBefore.java | 36 +++++++++---------- .../DirectorVerifyAfter.java | 28 +++++++++------ .../MemberUploadInfoAfter.java | 10 ++---- .../ChargeVerifyAfter.java | 9 +++-- .../ChargeVerifyBefore.java | 2 +- .../DirectorChooseBefore.java | 2 +- .../EngineerReviseBefore.java | 2 +- .../EngineerReviseDoneAfter.java | 2 +- .../EngineerReviseDoneBefore.java | 2 +- .../LeaderVerifyBefore.java | 2 +- .../StandardMeetProcess/ManageSignBefore.java | 2 +- .../PresidentVerifyBefore.java | 2 +- .../WriteMaterialAfter.java | 13 ++----- .../WriteMemberInfoBefore.java | 2 +- .../EngineerReviseDoneAfter.java | 5 +-- 16 files changed, 57 insertions(+), 70 deletions(-) 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 index 7f52958a..7a031ea2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java @@ -30,19 +30,17 @@ public class AutoStartAfter implements TaskListener { 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 prcName ="标准化活动会后流程-"; if(StringUtils.isNotBlank(object.getString("member"))) { + prcName = prcName + "参会人上传会议资料，填写标准及议题"; nextUserList.add(object.getString("member")); delegateTask.setVariable("member", nextUserList); } @@ -55,7 +53,6 @@ public class AutoStartAfter implements TaskListener { 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()); @@ -74,7 +71,6 @@ public class AutoStartAfter implements TaskListener { 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()); 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 index 500581c4..cdf74110 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java @@ -14,22 +14,22 @@ public class AutoStartBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzhhStep?prcType=22"; - 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); - } +// String link = "bzhhStep?prcType=22"; +// 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 index d18970e4..fba39742 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java @@ -16,7 +16,9 @@ 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.Date; import java.util.List; /** @@ -30,30 +32,29 @@ public class DirectorVerifyAfter implements TaskListener { 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 prcName ="标准化活动会后流程-"; if("1".equals(object.getString("passFlag"))){ delegateTask.setVariable("pass",1); - //TODO 流程结束 入库操作待写 + prcName = prcName + "流程结束"; + }else{ delegateTask.setVariable("pass",0); - + prcName = prcName + "参会人上传会议资料，填写标准及议题"; if(StringUtils.isNotBlank(object.getString("member"))) { nextUserList.add(object.getString("member")); delegateTask.setVariable("member", nextUserList); } } + // 存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); @@ -68,16 +69,14 @@ public class DirectorVerifyAfter implements TaskListener { } } - - //截止时间 流程描述 创建人 + 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()); @@ -86,6 +85,7 @@ public class DirectorVerifyAfter implements TaskListener { one1.setPrcType("22"); one1.setPrcName(prcName); one1.setCreatUser(user); + one1.setOverTime(OVERTIME); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } @@ -96,7 +96,6 @@ public class DirectorVerifyAfter implements TaskListener { 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()); @@ -104,6 +103,15 @@ public class DirectorVerifyAfter implements TaskListener { 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(delegateTask.getName()); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); } } } 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 index a545acfe..0f544606 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java @@ -30,25 +30,21 @@ public class MemberUploadInfoAfter implements TaskListener { 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 prcName ="标准化活动会后流程-"; if(StringUtils.isNotBlank(object.getString("director"))) { + prcName = prcName + "标准法规业务主管批准"; nextUserList.add(object.getString("director")); delegateTask.setVariable("director", nextUserList); } - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); @@ -56,7 +52,6 @@ public class MemberUploadInfoAfter implements TaskListener { 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()); @@ -75,7 +70,6 @@ public class MemberUploadInfoAfter implements TaskListener { 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()); 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 32299470..fe1444a0 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 @@ -30,7 +30,6 @@ public class ChargeVerifyAfter implements TaskListener { 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()); @@ -50,18 +49,18 @@ public class ChargeVerifyAfter implements TaskListener { } if("1".equals(object.getString("passFlag"))){//通过 - JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + JSONArray os = object.getJSONObject("ch_pageData").getJSONArray("myPartRole"); sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); if(sum.isEmpty()){ sum = object; delegateTask.setVariable("membersSumJSON",sum); }else { - JSONObject o1 = sum.getJSONObject("rh_pageData"); + JSONObject o1 = sum.getJSONObject("ch_pageData"); JSONObject o = os.getJSONObject(0); - JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + JSONArray os1 = sum.getJSONObject("ch_pageData").getJSONArray("myPartRole"); os1.add(o); o1.put("myPartRole",os1); - sum.put("rh_pageData",o1); + sum.put("ch_pageData",o1); delegateTask.setVariable("membersSumJSON",sum); } count = delegateTask.getVariable("chargePassCount",Integer.class); 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 00df1e02..64dcf54e 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 @@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep4?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); 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 edf1b148..6378a207 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 @@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep2?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 e203b821..12728e69 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 @@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep5?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 2ac661bb..c71ef580 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 @@ -41,7 +41,7 @@ public class EngineerReviseDoneAfter implements TaskListener { String prcName = "标准化活动参会流程-"; // prcName = "标准化活动参会流程-" + "会议结束"; prcName = prcName + "流程结束"; - //TODO 流程结束，汇总 + //截止时间 流程描述 创建人 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 6485c216..417fd319 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 @@ -14,7 +14,7 @@ public class EngineerReviseDoneBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep6?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 c7856218..68af5ca9 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 @@ -14,7 +14,7 @@ public class LeaderVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep6?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 6c7e3488..e3e4ca4d 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 @@ -14,7 +14,7 @@ public class ManageSignBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep6?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 ca637a9d..bbb8a082 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 @@ -14,7 +14,7 @@ public class PresidentVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep6?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 7c2ea60a..7a4c42b5 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 @@ -29,22 +29,16 @@ public class WriteMaterialAfter implements TaskListener { 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 prcName = "标准化活动参会流程-"; - // 入会申请信息重新封装 - if(StringUtils.isNotBlank(object.getString("directorList"))) { + String prcName = "标准化活动参会流程-"; + if(StringUtils.isNotBlank(object.getString("directorList"))) { if (object.getString("directorList").contains(",")) { nextUserList = Arrays.asList(object.getString("directorList").split(",")); } else { @@ -54,6 +48,7 @@ public class WriteMaterialAfter implements TaskListener { delegateTask.setVariable("directorList", nextUserList); prcName = prcName + "分委会主任/部门中心主任提名入会代表"; } + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); @@ -62,7 +57,6 @@ public class WriteMaterialAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -73,7 +67,6 @@ public class WriteMaterialAfter implements TaskListener { one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew(); 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 33c732b8..845055e3 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 @@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep3?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 7e027b4d..003abca2 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 @@ -37,14 +37,11 @@ public class EngineerReviseDoneAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; // prcName = "标准化活动入会流程-" + "会议结束"; prcName = prcName + "流程结束"; - //TODO 流程结束，入库 - - - //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); From 3333a9ad1ad0d64a1c48907f185da99b4bd710c9 Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 1 Nov 2021 14:48:13 +0800 Subject: [PATCH 06/17] =?UTF-8?q?zcr:=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=8F=82=E4=BC=9A=20=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/StandardAfterMeetProcess/AutoStartAfter.java | 2 +- .../listener/StandardAfterMeetProcess/DirectorVerifyAfter.java | 2 +- .../StandardAfterMeetProcess/MemberUploadInfoAfter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 index 7a031ea2..bc386aa2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java @@ -42,7 +42,7 @@ public class AutoStartAfter implements TaskListener { if(StringUtils.isNotBlank(object.getString("member"))) { prcName = prcName + "参会人上传会议资料，填写标准及议题"; nextUserList.add(object.getString("member")); - delegateTask.setVariable("member", nextUserList); + delegateTask.setVariable("member", object.getString("member")); } 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 index fba39742..6f0bf4f3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java @@ -50,7 +50,7 @@ public class DirectorVerifyAfter implements TaskListener { prcName = prcName + "参会人上传会议资料，填写标准及议题"; if(StringUtils.isNotBlank(object.getString("member"))) { nextUserList.add(object.getString("member")); - delegateTask.setVariable("member", nextUserList); + delegateTask.setVariable("member", object.getString("member")); } } 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 index 0f544606..7545fa58 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java @@ -42,7 +42,7 @@ public class MemberUploadInfoAfter implements TaskListener { if(StringUtils.isNotBlank(object.getString("director"))) { prcName = prcName + "标准法规业务主管批准"; nextUserList.add(object.getString("director")); - delegateTask.setVariable("director", nextUserList); + delegateTask.setVariable("director", object.getString("director")); } //截止时间 流程描述 创建人 From 49326ea53048736b8222a729a06f3c2101aa82fd Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 29 Oct 2021 14:23:11 +0800 Subject: [PATCH 07/17] taskFinishV1.3 --- .../ChargeVerifyAfter.java | 29 ++++++++++++--- .../EngineerReviseAfter.java | 11 +----- .../EngineerReviseDoneAfter.java | 7 +--- .../LeaderVerifyAfter.java | 11 +++--- .../StandardMeetProcess/ManageSignAfter.java | 16 ++++---- .../PresidentVerifyAfter.java | 16 ++++---- .../WriteMemberInfoAfter.java | 9 ++--- .../ChargeVerifyAfter.java | 37 +++++++++++++++---- .../EngineerReviseAfter.java | 8 ++-- .../EngineerReviseDoneAfter.java | 1 + .../LeaderVerifyAfter.java | 11 +++--- .../ManageSignAfter.java | 19 ++++------ .../PresidentVerifyAfter.java | 17 ++++----- .../WriteMemberInfoAfter.java | 9 +---- 14 files changed, 105 insertions(+), 96 deletions(-) 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 ff78244b..cbc1e186 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 @@ -42,10 +42,13 @@ public class ChargeVerifyAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); + JSONObject sum = new JSONObject(); + if(null == delegateTask.getVariable("membersSumJSON")){ + delegateTask.setVariable("membersSumJSON",sum); + } Integer count = 0; - if(null == delegateTask.getVariable("chargePassCount")){ delegateTask.setVariable("chargePassCount",count); } @@ -72,6 +75,22 @@ public class ChargeVerifyAfter implements TaskListener { if(rat == 0){ if("1".equals(object.getString("passFlag"))){//通过 + JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + + sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); + if(sum.isEmpty()){ + sum = object; + delegateTask.setVariable("membersSumJSON",sum); + }else { + JSONObject o1 = sum.getJSONObject("rh_pageData"); + JSONObject o = os.getJSONObject(0); + JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + os1.add(o); + o1.put("myPartRole",os1); + sum.put("rh_pageData",o1); + delegateTask.setVariable("membersSumJSON",sum); + } + idList.add(object.getString("member")); delegateTask.setVariable("chargeIdList",idList); @@ -85,8 +104,8 @@ public class ChargeVerifyAfter implements TaskListener { 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); - }//下一节点 + delegateTask.setVariable("engineerSum", object.getString("engineerSum")); + } } }else{ delegateTask.setVariable("pass2",0);//排他通道 @@ -141,8 +160,8 @@ prcName = standName + "-标准化活动参会流程-"; BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(objects.toJSONString()); -// busProcessNewNext.setMesg(object.toJSONString()); + JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); + busProcessNewNext.setMesg(hand.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); 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 f92f0fc3..03eb7f94 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 @@ -2,7 +2,6 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; 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; @@ -12,7 +11,6 @@ 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; @@ -29,8 +27,6 @@ public class EngineerReviseAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -38,13 +34,10 @@ public class EngineerReviseAfter implements TaskListener { 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); - } + nextUserList.add(object.getString("leader")); + delegateTask.setVariable("leader", object.getString("leader")); //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); 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 98b03e9d..cfda8128 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 @@ -29,17 +29,13 @@ public class EngineerReviseDoneAfter implements TaskListener { 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(); @@ -47,8 +43,6 @@ public class EngineerReviseDoneAfter implements TaskListener { - - //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); @@ -67,6 +61,7 @@ public class EngineerReviseDoneAfter implements TaskListener { if (one1 != null) { one1.setPrcType("21"); one1.setPrcName(prcName); + one1.setOverTime(OVERTIME); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(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 4d747b85..d749ab91 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,12 +58,11 @@ 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); - } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } } // 存储当前节点意见 if (null != object.getString("commentText")) { 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 7111ccaa..1cd0bdce 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 @@ -70,21 +70,19 @@ public class ManageSignAfter implements TaskListener { count++; delegateTask.setVariable("managePassCount",count); 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); - } + nextUserList.add(object.getString("president")); + delegateTask.setVariable("president", object.getString("president")); delegateTask.setVariable("pass4",1); } }else{ delegateTask.setVariable("pass4",0); - delegateTask.removeVariable("manageIdList"); - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - } +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } }else{ throw new ActivitiException("此对象已经审批过了"); 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 040a9152..3dae16f7 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 @@ -44,17 +44,15 @@ public class PresidentVerifyAfter implements TaskListener { // 入会申请信息重新封装 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); - } - + nextUserList.add(object.getString("engineerSumDone")); + delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone")); }else{ delegateTask.setVariable("pass5",0); - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - } +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } // 存储当前节点意见 if (null != object.getString("commentText")) { 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 5210a0e0..01c4e7f9 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 @@ -43,12 +43,9 @@ public class WriteMemberInfoAfter implements TaskListener { 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")); - } + + nextUserList.add(object.getString("charge")); + delegateTask.setVariable("charge", object.getString("charge")); //截止时间 流程描述 创建人 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index 39efddf1..d6a2ec4a 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,5 +1,6 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,6 +15,7 @@ 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.activiti.engine.impl.json.JsonObjectConverter; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; @@ -31,7 +33,6 @@ public class ChargeVerifyAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -43,9 +44,13 @@ public class ChargeVerifyAfter implements TaskListener { List nextUserList = new ArrayList(); + JSONObject sum = new JSONObject(); + if(null == delegateTask.getVariable("membersSumJSON")){ + delegateTask.setVariable("membersSumJSON",sum); + } + Integer count = 0; - if(null == delegateTask.getVariable("chargePassCount")){ delegateTask.setVariable("chargePassCount",count); } @@ -72,21 +77,37 @@ public class ChargeVerifyAfter implements TaskListener { if(rat == 0){ if("1".equals(object.getString("passFlag"))){//通过 + JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + + sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); + if(sum.isEmpty()){ + sum = object; + delegateTask.setVariable("membersSumJSON",sum); + }else { + JSONObject o1 = sum.getJSONObject("rh_pageData"); + JSONObject o = os.getJSONObject(0); + JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + os1.add(o); + o1.put("myPartRole",os1); + sum.put("rh_pageData",o1); + delegateTask.setVariable("membersSumJSON",sum); + } + 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("pass2",1);//排他通道 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); - }//下一节点 + delegateTask.setVariable("engineerSum", object.getString("engineerSum")); + } } }else{ delegateTask.setVariable("pass2",0);//排他通道 @@ -141,8 +162,8 @@ prcName = standName + "-标准化活动入会流程-"; BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(objects.toJSONString()); -// busProcessNewNext.setMesg(object.toJSONString()); + JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); + busProcessNewNext.setMesg(hand.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index 25572801..b7150d8a 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 @@ -41,10 +41,10 @@ public class EngineerReviseAfter implements TaskListener { List nextUserList = new ArrayList(); - if (StringUtils.isNotBlank(object.getString("leader"))) { - nextUserList.add(object.getString("leader")); - delegateTask.setVariable("leader", nextUserList); - } + nextUserList.add(object.getString("leader")); + delegateTask.setVariable("leader", object.getString("leader")); + + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); 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 26d0728d..f6649dad 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 @@ -67,6 +67,7 @@ public class EngineerReviseDoneAfter implements TaskListener { one1.setPrcType("20"); one1.setPrcName(prcName); one1.setCreatUser(user); + one1.setOverTime(OVERTIME); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index 6aa2397a..84e1d731 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 @@ -30,8 +30,6 @@ public class LeaderVerifyAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -58,10 +56,11 @@ 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); - } +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } // 存储当前节点意见 if (null != object.getString("commentText")) { 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 2197858c..e6a9c5bb 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 @@ -62,31 +62,26 @@ public class ManageSignAfter implements TaskListener { } idList.add(object.getString("manageDepartment")); delegateTask.setVariable("manageIdList",idList); - - if(rat == 0){ if("1".equals(object.getString("passFlag"))) {//通过 - count = delegateTask.getVariable("managePassCount",Integer.class); count++; delegateTask.setVariable("managePassCount",count); 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); - } + nextUserList.add(object.getString("president")); + delegateTask.setVariable("president", object.getString("president")); delegateTask.setVariable("pass4",1); } }else{ delegateTask.setVariable("pass4",0); delegateTask.removeVariable("manageIdList"); - - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - } +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } }else{ throw new ActivitiException("此对象已经审批过了"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index 811aeb38..4e677255 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 @@ -44,17 +44,16 @@ public class PresidentVerifyAfter implements TaskListener { // 入会申请信息重新封装 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); - } - + nextUserList.add(object.getString("engineerSumDone")); + delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone")); }else{ delegateTask.setVariable("pass5",0); - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - } +// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { +// nextUserList.add(object.getString("engineerSum")); +// delegateTask.setVariable("engineerSum", nextUserList); +// } + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); + } // 存储当前节点意见 if (null != object.getString("commentText")) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index 52de2fc8..97ce5683 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 @@ -43,13 +43,8 @@ public class WriteMemberInfoAfter implements TaskListener { 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")); - } - + nextUserList.add(object.getString("charge")); + delegateTask.setVariable("charge",object.getString("charge")); //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); From 7169f3a2544a0e183737cda8171883ad2be37ebf Mon Sep 17 00:00:00 2001 From: Kevin Date: Sat, 30 Oct 2021 18:46:01 +0800 Subject: [PATCH 08/17] =?UTF-8?q?taskFinish-=E6=B5=81=E7=A8=8B=E7=95=85?= =?UTF-8?q?=E9=80=9A=5FprcName=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoStartAfter.java | 4 +- .../DirectorVerifyAfter.java | 4 +- .../MemberUploadInfoAfter.java | 4 +- .../ChargeVerifyAfter.java | 19 +++--- .../DirectorChooseAfter.java | 4 +- .../EngineerReviseAfter.java | 4 +- .../EngineerReviseDoneAfter.java | 13 +++- .../LeaderVerifyAfter.java | 4 +- .../StandardMeetProcess/ManageSignAfter.java | 20 ++----- .../PresidentVerifyAfter.java | 4 +- .../WriteMaterialAfter.java | 4 +- .../WriteMemberInfoAfter.java | 4 +- .../ChargeVerifyAfter.java | 55 +++++------------ .../ChargeVerifyBefore.java | 2 +- .../DirectorChooseAfter.java | 39 +++--------- .../DirectorChooseBefore.java | 2 +- .../EngineerReviseAfter.java | 5 +- .../EngineerReviseBefore.java | 2 +- .../EngineerReviseDoneAfter.java | 22 ++++--- .../EngineerReviseDoneBefore.java | 4 +- .../LeaderVerifyAfter.java | 13 ++-- .../LeaderVerifyBefore.java | 4 +- .../ManageSignAfter.java | 59 ++++++------------- .../ManageSignBefore.java | 4 +- .../PresidentVerifyAfter.java | 16 ++--- .../PresidentVerifyBefore.java | 4 +- .../WriteMaterialAfter.java | 6 +- .../WriteMaterialBefore.java | 18 ------ .../WriteMemberInfoAfter.java | 5 +- .../WriteMemberInfoBefore.java | 2 +- 30 files changed, 118 insertions(+), 232 deletions(-) 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 index cd4735f4..7f52958a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java @@ -55,9 +55,7 @@ public class AutoStartAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动会后流程-"; + String prcName ="标准化活动会后流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 index cbe96e50..d18970e4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java @@ -77,9 +77,7 @@ public class DirectorVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动会后流程-"; + String prcName ="标准化活动会后流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 index bd5ba54e..a545acfe 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java @@ -56,9 +56,7 @@ public class MemberUploadInfoAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动会后流程-"; + String prcName ="标准化活动会后流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 cbc1e186..9d926704 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 @@ -76,7 +76,6 @@ public class ChargeVerifyAfter implements TaskListener { if("1".equals(object.getString("passFlag"))){//通过 JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); if(sum.isEmpty()){ sum = object; @@ -109,10 +108,7 @@ public class ChargeVerifyAfter implements TaskListener { } }else{ delegateTask.setVariable("pass2",0);//排他通道 - if(StringUtils.isNotBlank(object.getString("member"))) { - nextUserList.add(object.getString("member")); - delegateTask.setVariable("member", nextUserList); - }//驳回重写 + nextUserList.add(object.getString("member")); } }else{ throw new ActivitiException("审批过了"); @@ -140,9 +136,7 @@ public class ChargeVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - -prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); @@ -160,8 +154,12 @@ prcName = standName + "-标准化活动参会流程-"; BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); - busProcessNewNext.setMesg(hand.toJSONString()); + if(delegateTask.getVariable("pass2",Integer.class).equals(0)){ + busProcessNewNext.setMesg(object.toJSONString()); + }else{ + JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); + busProcessNewNext.setMesg(hand.toJSONString()); + } busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); @@ -170,5 +168,6 @@ prcName = standName + "-标准化活动参会流程-"; busBean.save(busProcessNewNext); } } + } } 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 a05e2a4a..c5358f64 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 @@ -106,9 +106,7 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 03eb7f94..495dd672 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 @@ -46,9 +46,7 @@ public class EngineerReviseAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 cfda8128..5604b11a 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 @@ -42,7 +42,6 @@ public class EngineerReviseDoneAfter implements TaskListener { //TODO 流程结束，汇总 - //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); @@ -53,7 +52,7 @@ public class EngineerReviseDoneAfter implements TaskListener { delegateTask.setVariable("listName", standName); String prcName = ""; - prcName = standName + "-标准化活动参会流程-"; + prcName = "标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); @@ -80,6 +79,16 @@ public class EngineerReviseDoneAfter implements TaskListener { 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(delegateTask.getName()); + prcName = "标准化活动参会流程" + "会议结束"; + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); } } } 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 d749ab91..2097410b 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 @@ -86,9 +86,7 @@ public class LeaderVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 1cd0bdce..283bfcf6 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 @@ -29,18 +29,16 @@ public class ManageSignAfter implements TaskListener { 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); @@ -65,7 +63,6 @@ public class ManageSignAfter implements TaskListener { delegateTask.setVariable("manageIdList",idList); if(rat == 0){ if("1".equals(object.getString("passFlag"))) {//通过 - count = delegateTask.getVariable("managePassCount",Integer.class); count++; delegateTask.setVariable("managePassCount",count); @@ -77,11 +74,6 @@ 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); -// } nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } }else{ @@ -100,6 +92,8 @@ public class ManageSignAfter implements TaskListener { busBean.saveOrUpdate(busProcessNews); } } + + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); @@ -107,9 +101,7 @@ public class ManageSignAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 3dae16f7..046658d3 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 @@ -75,9 +75,7 @@ public class PresidentVerifyAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 501b8f0b..d8e99853 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 @@ -60,9 +60,7 @@ public class WriteMaterialAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); 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 01c4e7f9..42b37ff1 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 @@ -55,9 +55,7 @@ public class WriteMemberInfoAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; - - prcName = standName + "-标准化活动参会流程-"; + String prcName ="标准化活动参会流程"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index d6a2ec4a..d22e6ae1 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 @@ -42,7 +42,7 @@ public class ChargeVerifyAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - + String prcName = "标准化活动入会流程-"; JSONObject sum = new JSONObject(); if(null == delegateTask.getVariable("membersSumJSON")){ @@ -54,31 +54,12 @@ public class ChargeVerifyAfter implements TaskListener { 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"))){//通过 JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); if(sum.isEmpty()){ sum = object; @@ -93,32 +74,24 @@ public class ChargeVerifyAfter implements TaskListener { delegateTask.setVariable("membersSumJSON",sum); } - idList.add(object.getString("member")); - delegateTask.setVariable("chargeIdList",idList); - count = delegateTask.getVariable("chargePassCount",Integer.class); delegateTask.setVariable("chargePassCount",count + 1); - objects = delegateTask.getVariable("chargePassList",JSONArray.class); - objects.add(object); delegateTask.setVariable("pass2",1);//排他通道 - delegateTask.setVariable("chargePassList",objects); + if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ + prcName = prcName + "标准法规工程师汇总修订"; if(StringUtils.isNotBlank(object.getString("engineerSum"))) { nextUserList.add(object.getString("engineerSum")); delegateTask.setVariable("engineerSum", object.getString("engineerSum")); } } }else{ + prcName = prcName + "入会代表填写入会信息表"; delegateTask.setVariable("pass2",0);//排他通道 - if(StringUtils.isNotBlank(object.getString("member"))) { - nextUserList.add(object.getString("member")); - delegateTask.setVariable("member", nextUserList); - }//驳回重写 + nextUserList.add(object.getString("member")); } - }else{ - throw new ActivitiException("审批过了"); - } + // 存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); @@ -142,9 +115,7 @@ public class ChargeVerifyAfter implements TaskListener { 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()); @@ -162,8 +133,12 @@ prcName = standName + "-标准化活动入会流程-"; BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); - busProcessNewNext.setMesg(hand.toJSONString()); + if(delegateTask.getVariable("pass2",Integer.class).equals(0)){ + busProcessNewNext.setMesg(object.toJSONString()); + }else{ + JSONObject hand = delegateTask.getVariable("membersSumJSON",JSONObject.class); + busProcessNewNext.setMesg(hand.toJSONString()); + } busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); 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 0d99b15d..475e88cc 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 @@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; + String link = "bzrhStep4?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 ce55aeaf..25ce0f64 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 @@ -28,9 +28,6 @@ public class DirectorChooseAfter implements TaskListener { 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()); @@ -40,33 +37,17 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - System.out.println("后置搭建完成"); + String prcName = "标准化活动入会流程-"; + //如果 他是通过 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("memberId"))){ - rat = 1; - break; - } - } - } - idList.add(object.getString("memberId")); - delegateTask.setVariable("memberIdList",idList); - if(rat == 0){ - if("1".equals(object.getString("passFlag"))) { + if("1".equals(object.getString("passFlag"))) { + prcName = prcName + "入会代表填写入会信息表"; nextUserList.add(object.getString("memberId")); if (null!=delegateTask.getVariable("memberList")) { List middle=delegateTask.getVariable("memberList",List.class); @@ -76,12 +57,12 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("memberList",nextUserList); } delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); - }else{ - //TODO 如果所有人未通过，则结束流程 } - }else{ - throw new ActivitiException("此对象已经审批过了"); - } + + if(delegateTask.getVariable("memberCount",Integer.class).equals(0)){ + throw new ActivitiException("所有人不涉及入会，流程终止"); + } + // 存储当前节点意见 @@ -104,9 +85,7 @@ public class DirectorChooseAfter implements TaskListener { 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()); 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 3c7d007b..34411513 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 @@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; + String link = "bzrhStep2?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index b7150d8a..3d3f46cd 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 @@ -40,7 +40,8 @@ public class EngineerReviseAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - + String prcName = "标准化活动入会流程-"; + prcName = prcName + "标准法规部主管领导审核"; nextUserList.add(object.getString("leader")); delegateTask.setVariable("leader", object.getString("leader")); @@ -53,9 +54,7 @@ public class EngineerReviseAfter implements TaskListener { 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()); 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 49c75d79..cdbe19ed 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 @@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; + String link = "bzrhStep5?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); 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 f6649dad..5b301984 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 @@ -30,21 +30,18 @@ public class EngineerReviseDoneAfter implements TaskListener { //流程信息 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 prcName = "标准化活动入会流程-"; +// prcName = "标准化活动入会流程" + "会议结束"; + prcName = prcName + "流程结束"; - - - //TODO 流程结束，汇总 + //TODO 流程结束，入库 @@ -56,9 +53,7 @@ public class EngineerReviseDoneAfter implements TaskListener { 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()); @@ -85,6 +80,15 @@ public class EngineerReviseDoneAfter implements TaskListener { 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(delegateTask.getName()); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); } } } 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 33316a1c..ffed6d8c 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 @@ -14,8 +14,8 @@ public class EngineerReviseDoneBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; - + String link = "bzrhStep6?prcType=20"; +//taskInfo=标准法规工程师汇总修订完毕 IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index 84e1d731..2bf6ffe5 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 @@ -34,11 +34,11 @@ public class LeaderVerifyAfter implements TaskListener { 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 prcName = "标准化活动入会流程-"; + if("1".equals(object.getString("passFlag"))) {//通过 delegateTask.setVariable("pass3",1); @@ -50,16 +50,13 @@ public class LeaderVerifyAfter implements TaskListener { nextUserList.add(object.getString("manageDepartmentList")); } // 配置多实例 + prcName = prcName + "费用管理部门会签"; delegateTask.setVariable("manageDepartmentList", nextUserList); delegateTask.setVariable("manageDepartmentCount",nextUserList.size()); - } }else{ + prcName = prcName + "标准法规工程师汇总修订"; delegateTask.setVariable("pass3",0); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } // 存储当前节点意见 @@ -84,9 +81,7 @@ public class LeaderVerifyAfter implements TaskListener { 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()); 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 9c7a538f..22058ddd 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 @@ -14,7 +14,9 @@ public class LeaderVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; + String link = "bzrhStep6?prcType=20"; +// taskInfo=标准法规部主管领导审核 + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); 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 e6a9c5bb..a48e545a 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 @@ -30,62 +30,39 @@ public class ManageSignAfter implements TaskListener { //流程信息 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 prcName = "标准化活动入会流程-"; 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; - } - } - } - idList.add(object.getString("manageDepartment")); - delegateTask.setVariable("manageIdList",idList); - if(rat == 0){ - if("1".equals(object.getString("passFlag"))) {//通过 - count = delegateTask.getVariable("managePassCount",Integer.class); - count++; - delegateTask.setVariable("managePassCount",count); - if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ - nextUserList.add(object.getString("president")); - delegateTask.setVariable("president", object.getString("president")); - delegateTask.setVariable("pass4",1); - } - - }else{ - delegateTask.setVariable("pass4",0); - delegateTask.removeVariable("manageIdList"); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } - nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); + if("1".equals(object.getString("passFlag"))) {//通过 + count = delegateTask.getVariable("managePassCount",Integer.class); + count++; + delegateTask.setVariable("managePassCount",count); + if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ + prcName = prcName + "技术委员会常务副主任/总院院长审定"; + nextUserList.add(object.getString("president")); + delegateTask.setVariable("president", object.getString("president")); + delegateTask.setVariable("managePassCount",0); + delegateTask.setVariable("pass4",1); } }else{ - throw new ActivitiException("此对象已经审批过了"); + prcName = prcName + "标准法规工程师汇总修订"; + delegateTask.setVariable("pass4",0); + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } + // 存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); @@ -106,9 +83,7 @@ public class ManageSignAfter implements TaskListener { 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()); 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 cb2b82f2..8659bb5c 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 @@ -14,8 +14,8 @@ public class ManageSignBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; - + String link = "bzrhStep6?prcType=20"; +//taskInfo=费用管理部门会签 IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index 4e677255..30257399 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 @@ -28,34 +28,28 @@ public class PresidentVerifyAfter implements TaskListener { 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 prcName = "标准化活动入会流程-"; if("1".equals(object.getString("passFlag"))) {//通过 + prcName = prcName + "标准法规工程师汇总修订完毕"; delegateTask.setVariable("pass5",1); nextUserList.add(object.getString("engineerSumDone")); delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone")); }else{ + prcName = prcName + "标准法规工程师汇总修订"; delegateTask.setVariable("pass5",0); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); - } - // 存储当前节点意见 + //存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -76,9 +70,7 @@ public class PresidentVerifyAfter implements TaskListener { 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()); 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 4154637d..0324f75a 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 @@ -14,8 +14,8 @@ public class PresidentVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; - + String link = "bzrhStep6?prcType=20"; +//taskInfo=技术委员会常务副主任 IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java index cbea2bde..dac7d739 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 @@ -42,6 +42,8 @@ public class WriteMaterialAfter implements TaskListener { List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; + // 入会申请信息重新封装 if(StringUtils.isNotBlank(object.getString("directorList"))) { @@ -52,6 +54,7 @@ public class WriteMaterialAfter implements TaskListener { } // 配置多实例 delegateTask.setVariable("directorList", nextUserList); + prcName = prcName + "技术委员会分委会主任/入会代表所在中心主任提名入会代表"; } //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); @@ -60,9 +63,7 @@ public class WriteMaterialAfter implements TaskListener { 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()); @@ -91,6 +92,7 @@ public class WriteMaterialAfter implements TaskListener { System.out.println("处理人:" + nextUser); System.out.println("流程名:" + prcName); System.out.println("节点信息:" + delegateTask.getName()); + System.out.println("节点信息2:" + delegateTask.getTaskDefinitionKey()); } } } 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 243ce174..c56f7d72 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 @@ -15,23 +15,5 @@ public class WriteMaterialBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; - 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/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index 97ce5683..aa337e28 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 @@ -42,7 +42,8 @@ public class WriteMemberInfoAfter implements TaskListener { List nextUserList = new ArrayList(); - + String prcName = "标准化活动入会流程-"; + prcName = prcName + "入会人员所在部门负责人审核"; nextUserList.add(object.getString("charge")); delegateTask.setVariable("charge",object.getString("charge")); @@ -53,9 +54,7 @@ public class WriteMemberInfoAfter implements TaskListener { 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()); 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 1e119e94..844af9b0 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 @@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=20"; + String link = "bzrhStep3?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); From 311c27e8b2bed760fe4bd311b62744d710a94080 Mon Sep 17 00:00:00 2001 From: Kevin Date: Sat, 30 Oct 2021 19:48:34 +0800 Subject: [PATCH 09/17] =?UTF-8?q?zcr:=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E6=95=B4=E6=94=B9=20+=20=E5=85=A5=E4=BC=9A=E4=BC=98=E5=8C=96?= =?UTF-8?q?=20+=20prcName=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoStartBefore.java | 2 +- .../DirectorVerifyBefore.java | 2 +- .../MemberUploadInfoBefore.java | 2 +- .../ChargeVerifyAfter.java | 93 ++++++------------- .../ChargeVerifyBefore.java | 2 +- .../DirectorChooseAfter.java | 58 ++++-------- .../DirectorChooseBefore.java | 2 +- .../EngineerReviseAfter.java | 5 +- .../EngineerReviseBefore.java | 2 +- .../EngineerReviseDoneAfter.java | 6 +- .../EngineerReviseDoneBefore.java | 2 +- .../LeaderVerifyAfter.java | 14 +-- .../LeaderVerifyBefore.java | 2 +- .../StandardMeetProcess/ManageSignAfter.java | 50 +++------- .../StandardMeetProcess/ManageSignBefore.java | 2 +- .../PresidentVerifyAfter.java | 14 +-- .../PresidentVerifyBefore.java | 2 +- .../WriteMaterialAfter.java | 5 +- .../WriteMaterialBefore.java | 2 +- .../WriteMemberInfoAfter.java | 11 +-- .../WriteMemberInfoBefore.java | 2 +- .../ChargeVerifyAfter.java | 67 ++++++------- .../DirectorChooseAfter.java | 40 ++++---- .../EngineerReviseAfter.java | 6 +- .../EngineerReviseDoneAfter.java | 2 +- .../LeaderVerifyAfter.java | 4 +- .../ManageSignAfter.java | 5 +- .../PresidentVerifyAfter.java | 4 +- .../WriteMemberInfoAfter.java | 5 - 29 files changed, 144 insertions(+), 269 deletions(-) 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 index 2584f77b..500581c4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java @@ -14,7 +14,7 @@ public class AutoStartBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=22"; + String link = "bzhhStep?prcType=22"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 index f70ca5ab..36da681e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java @@ -14,7 +14,7 @@ public class DirectorVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=22"; + String link = "bzhhStep?prcType=22"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 index f883cb31..c9647980 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java @@ -14,7 +14,7 @@ public class MemberUploadInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=22"; + String link = "bzhhStep?prcType=22"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 9d926704..32299470 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 @@ -30,89 +30,57 @@ public class ChargeVerifyAfter implements TaskListener { 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 prcName = "标准化活动参会流程-"; JSONObject sum = new JSONObject(); if(null == delegateTask.getVariable("membersSumJSON")){ delegateTask.setVariable("membersSumJSON",sum); } - - 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("1".equals(object.getString("passFlag"))){//通过 + JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); + if(sum.isEmpty()){ + sum = object; + delegateTask.setVariable("membersSumJSON",sum); + }else { + JSONObject o1 = sum.getJSONObject("rh_pageData"); + JSONObject o = os.getJSONObject(0); + JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + os1.add(o); + o1.put("myPartRole",os1); + sum.put("rh_pageData",o1); + delegateTask.setVariable("membersSumJSON",sum); } - } - if(rat == 0){ - if("1".equals(object.getString("passFlag"))){//通过 - - JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); - if(sum.isEmpty()){ - sum = object; - delegateTask.setVariable("membersSumJSON",sum); - }else { - JSONObject o1 = sum.getJSONObject("rh_pageData"); - JSONObject o = os.getJSONObject(0); - JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - os1.add(o); - o1.put("myPartRole",os1); - sum.put("rh_pageData",o1); - delegateTask.setVariable("membersSumJSON",sum); + count = delegateTask.getVariable("chargePassCount",Integer.class); + delegateTask.setVariable("chargePassCount",count + 1); + delegateTask.setVariable("pass2",1);//排他通道 + System.out.println(delegateTask.getVariable("chargePassList")); + if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ + prcName = prcName + "标准法规工程师修订"; + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", object.getString("engineerSum")); } - - 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", object.getString("engineerSum")); - } - } - }else{ - delegateTask.setVariable("pass2",0);//排他通道 - nextUserList.add(object.getString("member")); } }else{ - throw new ActivitiException("审批过了"); + prcName = prcName + "参会代表填写参会信息表"; + delegateTask.setVariable("pass2",0);//排他通道 + nextUserList.add(object.getString("member")); } + // 存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); @@ -127,8 +95,6 @@ public class ChargeVerifyAfter implements TaskListener { } } - - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); @@ -136,7 +102,6 @@ public class ChargeVerifyAfter implements TaskListener { 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()); 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 45c4e771..00df1e02 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 @@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); 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 c5358f64..d82b3d03 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 @@ -30,59 +30,42 @@ public class DirectorChooseAfter implements TaskListener { //流程信息 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); } + String prcName = "标准化活动参会流程-"; - //防止重复审批同一对象 - List idList = new ArrayList<>(); - if(null == delegateTask.getVariable("memberIdList")){ - delegateTask.setVariable("memberIdList", idList); + //全员不通过，检测条件 directorCount + //TODO 1全员不通过,2会后需要多实例吗? + Integer allCount = delegateTask.getVariable("directorList",List.class).size();; + Integer count = 0; + if(null == delegateTask.getVariable("directorCount")){ + delegateTask.setVariable("directorCount", count); } - int rat = 0; - idList = delegateTask.getVariable("memberIdList",List.class); - if(!idList.isEmpty()){ - for(String a : idList){ - if(a.equals(object.getString("memberId"))){ - rat = 1; - break; - } - } - } - idList.add(object.getString("memberId")); - delegateTask.setVariable("memberIdList",idList); + count = delegateTask.getVariable("directorCount",Integer.class); + delegateTask.setVariable("directorCount",count+1); - if(rat == 0){ - 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); - } - delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); - }else{ - //TODO 如果所有人未通过，则结束流程 + if("1".equals(object.getString("passFlag"))) { + prcName = prcName + "参会代表填写参会信息表"; + 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); } - }else{ - throw new ActivitiException("此对象已经审批过了"); + delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); } @@ -106,7 +89,6 @@ public class DirectorChooseAfter implements TaskListener { 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()); 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 ccad914f..edf1b148 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 @@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 495dd672..b596c261 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 @@ -26,16 +26,16 @@ public class EngineerReviseAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.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 prcName = "标准化活动参会流程-"; + prcName = prcName + "技术管理中心主任审批"; nextUserList.add(object.getString("leader")); delegateTask.setVariable("leader", object.getString("leader")); @@ -46,7 +46,6 @@ public class EngineerReviseAfter implements TaskListener { 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()); 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 a1403a34..e203b821 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 @@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 5604b11a..2ac661bb 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 @@ -38,7 +38,9 @@ public class EngineerReviseDoneAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - + String prcName = "标准化活动参会流程-"; +// prcName = "标准化活动参会流程-" + "会议结束"; + prcName = prcName + "流程结束"; //TODO 流程结束，汇总 @@ -50,7 +52,6 @@ public class EngineerReviseDoneAfter implements TaskListener { delegateTask.setVariable("createUserName", username); String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - String prcName = ""; prcName = "标准化活动参会流程"; @@ -86,7 +87,6 @@ public class EngineerReviseDoneAfter implements TaskListener { busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); - prcName = "标准化活动参会流程" + "会议结束"; busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } 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 f054da16..6485c216 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 @@ -14,7 +14,7 @@ public class EngineerReviseDoneBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 2097410b..88374852 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 @@ -29,19 +29,15 @@ public class LeaderVerifyAfter implements TaskListener { 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 prcName = "标准化活动参会流程-"; if("1".equals(object.getString("passFlag"))) {//通过 delegateTask.setVariable("pass3",1); if(StringUtils.isNotBlank(object.getString("manageDepartmentList"))) { @@ -54,15 +50,12 @@ public class LeaderVerifyAfter implements TaskListener { // 配置多实例 delegateTask.setVariable("manageDepartmentList", nextUserList); delegateTask.setVariable("manageDepartmentCount",nextUserList.size()); - + prcName = prcName + "费用管理部门会签"; } }else{ delegateTask.setVariable("pass3",0); nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } + prcName = prcName + "标准法规工程师修订"; } // 存储当前节点意见 if (null != object.getString("commentText")) { @@ -86,7 +79,6 @@ public class LeaderVerifyAfter implements TaskListener { 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()); 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 d3f917f6..c7856218 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 @@ -14,7 +14,7 @@ public class LeaderVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 283bfcf6..23cb4f60 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 @@ -37,47 +37,26 @@ public class ManageSignAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - - + String prcName = "标准化活动参会流程-"; 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; - } - } - } - idList.add(object.getString("manageDepartment")); - delegateTask.setVariable("manageIdList",idList); - if(rat == 0){ - if("1".equals(object.getString("passFlag"))) {//通过 - count = delegateTask.getVariable("managePassCount",Integer.class); - count++; - delegateTask.setVariable("managePassCount",count); - if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ - nextUserList.add(object.getString("president")); - delegateTask.setVariable("president", object.getString("president")); - delegateTask.setVariable("pass4",1); - } - - }else{ - delegateTask.setVariable("pass4",0); - nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); + if("1".equals(object.getString("passFlag"))) {//通过 + count = delegateTask.getVariable("managePassCount",Integer.class); + count++; + delegateTask.setVariable("managePassCount",count); + if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ + prcName = prcName + "技术委员会常务副主任/总院院长审定"; + nextUserList.add(object.getString("president")); + delegateTask.setVariable("managePassCount",0); + delegateTask.setVariable("president", object.getString("president")); + delegateTask.setVariable("pass4",1); } }else{ - throw new ActivitiException("此对象已经审批过了"); + prcName = prcName + "标准法规工程师修订"; + delegateTask.setVariable("pass4",0); + nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } // 存储当前节点意见 if (null != object.getString("commentText")) { @@ -101,7 +80,6 @@ public class ManageSignAfter implements TaskListener { 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()); 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 c33e641a..6c7e3488 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 @@ -14,7 +14,7 @@ public class ManageSignBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 046658d3..fa53a424 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 @@ -28,30 +28,23 @@ public class PresidentVerifyAfter implements TaskListener { 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 prcName = "标准化活动参会流程-"; if("1".equals(object.getString("passFlag"))) {//通过 + prcName = prcName + "标准法规工程师修订完毕"; delegateTask.setVariable("pass5",1); nextUserList.add(object.getString("engineerSumDone")); delegateTask.setVariable("engineerSumDone", object.getString("engineerSumDone")); }else{ + prcName = prcName + "标准法规工程师修订"; delegateTask.setVariable("pass5",0); -// if(StringUtils.isNotBlank(object.getString("engineerSum"))) { -// nextUserList.add(object.getString("engineerSum")); -// delegateTask.setVariable("engineerSum", nextUserList); -// } nextUserList.add(delegateTask.getVariable("engineerSum",String.class)); } // 存储当前节点意见 @@ -75,7 +68,6 @@ public class PresidentVerifyAfter implements TaskListener { 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()); 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 8bad174b..ca637a9d 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 @@ -14,7 +14,7 @@ public class PresidentVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 d8e99853..7c2ea60a 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 @@ -41,7 +41,7 @@ public class WriteMaterialAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - + String prcName = "标准化活动参会流程-"; // 入会申请信息重新封装 if(StringUtils.isNotBlank(object.getString("directorList"))) { @@ -52,6 +52,7 @@ public class WriteMaterialAfter implements TaskListener { } // 配置多实例 delegateTask.setVariable("directorList", nextUserList); + prcName = prcName + "分委会主任/部门中心主任提名入会代表"; } //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); @@ -60,7 +61,7 @@ public class WriteMaterialAfter implements TaskListener { 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()); 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 54d2f747..91e65bf8 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 @@ -15,7 +15,7 @@ public class WriteMaterialBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 42b37ff1..c29ae72b 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 @@ -29,25 +29,19 @@ public class WriteMemberInfoAfter implements TaskListener { 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 prcName = "标准化活动参会流程-"; + prcName = prcName + "参会人员所在部门中心主任审核"; nextUserList.add(object.getString("charge")); delegateTask.setVariable("charge", object.getString("charge")); - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); @@ -55,7 +49,6 @@ public class WriteMemberInfoAfter implements TaskListener { 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()); 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 3c0d550d..33c732b8 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 @@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=21"; + String link = "bzchStep?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index d22e6ae1..713b8569 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 @@ -32,65 +32,53 @@ public class ChargeVerifyAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.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 prcName = "标准化活动入会流程-"; + String prcName = "标准化活动入会流程-"; JSONObject sum = new JSONObject(); if(null == delegateTask.getVariable("membersSumJSON")){ delegateTask.setVariable("membersSumJSON",sum); } - - Integer count = 0; if(null == delegateTask.getVariable("chargePassCount")){ delegateTask.setVariable("chargePassCount",count); } - - - - if("1".equals(object.getString("passFlag"))){//通过 - - JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); - if(sum.isEmpty()){ - sum = object; - delegateTask.setVariable("membersSumJSON",sum); - }else { - JSONObject o1 = sum.getJSONObject("rh_pageData"); - JSONObject o = os.getJSONObject(0); - JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); - os1.add(o); - o1.put("myPartRole",os1); - sum.put("rh_pageData",o1); - delegateTask.setVariable("membersSumJSON",sum); + if("1".equals(object.getString("passFlag"))){//通过 + JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); + if(sum.isEmpty()){ + sum = object; + delegateTask.setVariable("membersSumJSON",sum); + }else { + JSONObject o1 = sum.getJSONObject("rh_pageData"); + JSONObject o = os.getJSONObject(0); + JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + os1.add(o); + o1.put("myPartRole",os1); + sum.put("rh_pageData",o1); + delegateTask.setVariable("membersSumJSON",sum); + } + count = delegateTask.getVariable("chargePassCount",Integer.class); + delegateTask.setVariable("chargePassCount",count + 1); + delegateTask.setVariable("pass2",1);//排他通道 + if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ + prcName = prcName + "标准法规工程师汇总修订"; + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", object.getString("engineerSum")); } - - - count = delegateTask.getVariable("chargePassCount",Integer.class); - delegateTask.setVariable("chargePassCount",count + 1); - delegateTask.setVariable("pass2",1);//排他通道 - - if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ - prcName = prcName + "标准法规工程师汇总修订"; - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", object.getString("engineerSum")); - } - } - }else{ + } + }else{ prcName = prcName + "入会代表填写入会信息表"; delegateTask.setVariable("pass2",0);//排他通道 nextUserList.add(object.getString("member")); - } + } // 存储当前节点意见 if (null != object.getString("commentText")) { @@ -107,7 +95,6 @@ public class ChargeVerifyAfter implements TaskListener { } - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); 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 25ce0f64..b2c3df50 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 @@ -32,37 +32,39 @@ public class DirectorChooseAfter implements TaskListener { 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 prcName = "标准化活动入会流程-"; + + String prcName = "标准化活动入会流程-"; //如果 他是通过 passFlag==1 List passMemberList = new ArrayList<>(); if(null == delegateTask.getVariable("memberList")){ delegateTask.setVariable("memberList", passMemberList); } + //全员不通过，检测条件 directorCount + Integer allCount = delegateTask.getVariable("directorList",List.class).size();; + Integer count = 0; + if(null == delegateTask.getVariable("directorCount")){ + delegateTask.setVariable("directorCount", count); + } + count = delegateTask.getVariable("directorCount",Integer.class); + delegateTask.setVariable("directorCount",count+1); - if("1".equals(object.getString("passFlag"))) { - prcName = prcName + "入会代表填写入会信息表"; - 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()); + if("1".equals(object.getString("passFlag"))) { + prcName = prcName + "入会代表填写入会信息表"; + 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); } - - if(delegateTask.getVariable("memberCount",Integer.class).equals(0)){ - throw new ActivitiException("所有人不涉及入会，流程终止"); - } - + delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); + } // 存储当前节点意见 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index 3d3f46cd..b28a90cc 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 @@ -28,18 +28,14 @@ public class EngineerReviseAfter implements TaskListener { 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 prcName = "标准化活动入会流程-"; prcName = prcName + "标准法规部主管领导审核"; nextUserList.add(object.getString("leader")); 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 5b301984..7e027b4d 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 @@ -38,7 +38,7 @@ public class EngineerReviseDoneAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); String prcName = "标准化活动入会流程-"; -// prcName = "标准化活动入会流程" + "会议结束"; +// prcName = "标准化活动入会流程-" + "会议结束"; prcName = prcName + "流程结束"; //TODO 流程结束，入库 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index 2bf6ffe5..a3ca73a5 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 @@ -29,7 +29,6 @@ public class LeaderVerifyAfter implements TaskListener { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -37,9 +36,8 @@ public class LeaderVerifyAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; - - if("1".equals(object.getString("passFlag"))) {//通过 delegateTask.setVariable("pass3",1); if(StringUtils.isNotBlank(object.getString("manageDepartmentList"))) { 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 a48e545a..d8e53aad 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 @@ -36,16 +36,13 @@ public class ManageSignAfter implements TaskListener { Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - - - List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; Integer count = 0; if(null == delegateTask.getVariable("managePassCount")){ delegateTask.setVariable("managePassCount",count); } - if("1".equals(object.getString("passFlag"))) {//通过 count = delegateTask.getVariable("managePassCount",Integer.class); count++; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index 30257399..5b551e2c 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 @@ -28,16 +28,14 @@ public class PresidentVerifyAfter implements TaskListener { 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 prcName = "标准化活动入会流程-"; if("1".equals(object.getString("passFlag"))) {//通过 prcName = prcName + "标准法规工程师汇总修订完毕"; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index aa337e28..85d15ddd 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 @@ -29,17 +29,12 @@ public class WriteMemberInfoAfter implements TaskListener { 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 prcName = "标准化活动入会流程-"; From 1c63ecf40420e7496519a6ee2af49f39be5ea455 Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 1 Nov 2021 14:25:08 +0800 Subject: [PATCH 10/17] =?UTF-8?q?zcr:=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=8F=82=E4=BC=9A=20=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AutoStartAfter.java | 8 ++--- .../AutoStartBefore.java | 36 +++++++++---------- .../DirectorVerifyAfter.java | 28 +++++++++------ .../MemberUploadInfoAfter.java | 10 ++---- .../ChargeVerifyAfter.java | 9 +++-- .../ChargeVerifyBefore.java | 2 +- .../DirectorChooseBefore.java | 2 +- .../EngineerReviseBefore.java | 2 +- .../EngineerReviseDoneAfter.java | 2 +- .../EngineerReviseDoneBefore.java | 2 +- .../LeaderVerifyBefore.java | 2 +- .../StandardMeetProcess/ManageSignBefore.java | 2 +- .../PresidentVerifyBefore.java | 2 +- .../WriteMaterialAfter.java | 13 ++----- .../WriteMemberInfoBefore.java | 2 +- .../EngineerReviseDoneAfter.java | 5 +-- 16 files changed, 57 insertions(+), 70 deletions(-) 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 index 7f52958a..7a031ea2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java @@ -30,19 +30,17 @@ public class AutoStartAfter implements TaskListener { 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 prcName ="标准化活动会后流程-"; if(StringUtils.isNotBlank(object.getString("member"))) { + prcName = prcName + "参会人上传会议资料，填写标准及议题"; nextUserList.add(object.getString("member")); delegateTask.setVariable("member", nextUserList); } @@ -55,7 +53,6 @@ public class AutoStartAfter implements TaskListener { 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()); @@ -74,7 +71,6 @@ public class AutoStartAfter implements TaskListener { 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()); 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 index 500581c4..cdf74110 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java @@ -14,22 +14,22 @@ public class AutoStartBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzhhStep?prcType=22"; - 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); - } +// String link = "bzhhStep?prcType=22"; +// 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 index d18970e4..fba39742 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java @@ -16,7 +16,9 @@ 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.Date; import java.util.List; /** @@ -30,30 +32,29 @@ public class DirectorVerifyAfter implements TaskListener { 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 prcName ="标准化活动会后流程-"; if("1".equals(object.getString("passFlag"))){ delegateTask.setVariable("pass",1); - //TODO 流程结束 入库操作待写 + prcName = prcName + "流程结束"; + }else{ delegateTask.setVariable("pass",0); - + prcName = prcName + "参会人上传会议资料，填写标准及议题"; if(StringUtils.isNotBlank(object.getString("member"))) { nextUserList.add(object.getString("member")); delegateTask.setVariable("member", nextUserList); } } + // 存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); @@ -68,16 +69,14 @@ public class DirectorVerifyAfter implements TaskListener { } } - - //截止时间 流程描述 创建人 + 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()); @@ -86,6 +85,7 @@ public class DirectorVerifyAfter implements TaskListener { one1.setPrcType("22"); one1.setPrcName(prcName); one1.setCreatUser(user); + one1.setOverTime(OVERTIME); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } @@ -96,7 +96,6 @@ public class DirectorVerifyAfter implements TaskListener { 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()); @@ -104,6 +103,15 @@ public class DirectorVerifyAfter implements TaskListener { 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(delegateTask.getName()); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); } } } 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 index a545acfe..0f544606 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java @@ -30,25 +30,21 @@ public class MemberUploadInfoAfter implements TaskListener { 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 prcName ="标准化活动会后流程-"; if(StringUtils.isNotBlank(object.getString("director"))) { + prcName = prcName + "标准法规业务主管批准"; nextUserList.add(object.getString("director")); delegateTask.setVariable("director", nextUserList); } - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); @@ -56,7 +52,6 @@ public class MemberUploadInfoAfter implements TaskListener { 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()); @@ -75,7 +70,6 @@ public class MemberUploadInfoAfter implements TaskListener { 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()); 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 32299470..fe1444a0 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 @@ -30,7 +30,6 @@ public class ChargeVerifyAfter implements TaskListener { 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()); @@ -50,18 +49,18 @@ public class ChargeVerifyAfter implements TaskListener { } if("1".equals(object.getString("passFlag"))){//通过 - JSONArray os = object.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + JSONArray os = object.getJSONObject("ch_pageData").getJSONArray("myPartRole"); sum = delegateTask.getVariable("membersSumJSON",JSONObject.class); if(sum.isEmpty()){ sum = object; delegateTask.setVariable("membersSumJSON",sum); }else { - JSONObject o1 = sum.getJSONObject("rh_pageData"); + JSONObject o1 = sum.getJSONObject("ch_pageData"); JSONObject o = os.getJSONObject(0); - JSONArray os1 = sum.getJSONObject("rh_pageData").getJSONArray("myPartRole"); + JSONArray os1 = sum.getJSONObject("ch_pageData").getJSONArray("myPartRole"); os1.add(o); o1.put("myPartRole",os1); - sum.put("rh_pageData",o1); + sum.put("ch_pageData",o1); delegateTask.setVariable("membersSumJSON",sum); } count = delegateTask.getVariable("chargePassCount",Integer.class); 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 00df1e02..64dcf54e 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 @@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep4?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); 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 edf1b148..6378a207 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 @@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep2?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 e203b821..12728e69 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 @@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep5?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 2ac661bb..c71ef580 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 @@ -41,7 +41,7 @@ public class EngineerReviseDoneAfter implements TaskListener { String prcName = "标准化活动参会流程-"; // prcName = "标准化活动参会流程-" + "会议结束"; prcName = prcName + "流程结束"; - //TODO 流程结束，汇总 + //截止时间 流程描述 创建人 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 6485c216..417fd319 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 @@ -14,7 +14,7 @@ public class EngineerReviseDoneBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep6?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 c7856218..68af5ca9 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 @@ -14,7 +14,7 @@ public class LeaderVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep6?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 6c7e3488..e3e4ca4d 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 @@ -14,7 +14,7 @@ public class ManageSignBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep6?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 ca637a9d..bbb8a082 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 @@ -14,7 +14,7 @@ public class PresidentVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep6?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 7c2ea60a..7a4c42b5 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 @@ -29,22 +29,16 @@ public class WriteMaterialAfter implements TaskListener { 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 prcName = "标准化活动参会流程-"; - // 入会申请信息重新封装 - if(StringUtils.isNotBlank(object.getString("directorList"))) { + String prcName = "标准化活动参会流程-"; + if(StringUtils.isNotBlank(object.getString("directorList"))) { if (object.getString("directorList").contains(",")) { nextUserList = Arrays.asList(object.getString("directorList").split(",")); } else { @@ -54,6 +48,7 @@ public class WriteMaterialAfter implements TaskListener { delegateTask.setVariable("directorList", nextUserList); prcName = prcName + "分委会主任/部门中心主任提名入会代表"; } + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); @@ -62,7 +57,6 @@ public class WriteMaterialAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName", standName); - QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -73,7 +67,6 @@ public class WriteMaterialAfter implements TaskListener { one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - if (nextUserList != null && !nextUserList.isEmpty()) { for (String nextUser : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew(); 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 33c732b8..845055e3 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 @@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzchStep?prcType=21"; + String link = "bzchStep3?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); 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 7e027b4d..003abca2 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 @@ -37,14 +37,11 @@ public class EngineerReviseDoneAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); + String prcName = "标准化活动入会流程-"; // prcName = "标准化活动入会流程-" + "会议结束"; prcName = prcName + "流程结束"; - //TODO 流程结束，入库 - - - //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); From 0c6aff3539173b000ac495e27fd944fdf685405c Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Mon, 1 Nov 2021 14:10:23 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JoinStandardFiling/JSFApproveAfter.java | 43 +++++----- .../JoinStandardFiling/JSFAuditAfter.java | 32 +++----- .../JSFFillinformationAfter.java | 7 +- .../JoinStandardFiling/JSFstartAfter.java | 5 +- .../PRFApproveAfter.java | 43 +++++----- .../PRFEngineerreviewAfter.java | 25 ++---- .../PRFFillinformationAfter.java | 81 +++++++++++-------- .../PRFReviewdockAfter.java | 23 ++---- .../PRFUnderengineerAfter.java | 11 ++- .../PRFstartAfter.java | 9 ++- .../RecommendedApproval/RAApproveAfter.java | 44 +++++----- .../RecommendedApproval/RAAuditAfter.java | 29 ++----- .../RAModifyInformationAfter.java | 8 +- .../RecommendedApproval/RASignAfter.java | 29 ++----- .../RAValidationAfter.java | 33 ++------ .../RecommendedApproval/RAstartAfter.java | 17 +++- 16 files changed, 194 insertions(+), 245 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java index 22f14184..b59abcb7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java @@ -36,11 +36,15 @@ public class JSFApproveAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); + List nextUserList = new ArrayList(); + String approvalOpinion = object.get("bzFlag") == null ? "" : object.get("bzFlag").toString(); if ("1".equalsIgnoreCase(approvalOpinion)) { - delegateTask.setVariable("Standardizer2", object.getString("Standardizer2User")); + delegateTask.setVariable("bzFlag", 1); + func1(delegateTask, busBean, object, "1", busProcessNameService); + } else { BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -48,41 +52,38 @@ public class JSFApproveAfter implements TaskListener { busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("Standardizer2User")); - busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busProcessNew.setUserId(object.getString("passUser")); + busProcessNew.setPrcName("加入标准化协会信息备案-修改入会信息"); busBean.save(busProcessNew); - - func1(delegateTask, busBean, object, "1"); + func2(delegateTask, busBean, object, "0"); delegateTask.setVariable("bzFlag", 2); - } else { - delegateTask.setVariable("bzFlag", 1); - func2(delegateTask, busBean, object, "0", busProcessNameService); + delegateTask.setVariable("statuteengineer",delegateTask.getVariable("prcCreateUser",String.class)); } } - private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { - QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("TASK_ID", delegateTask.getId()); - BusProcessNew one1 = busBean.getOne(queryWrapper1); - if (one1 != null) { - one1.setCommitFlag(commitFlag); - one1.setCommitText(object.getString("commentText")); - busBean.saveOrUpdate(one1); - } - } - - private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); if (one2 != null) { - //one2.setPrcName("入库流程结束"); +// one2.setPrcName("入库流程结束"); one2.setOverTime(OVERTIME); one2.setPrcType("1"); busProcessNameService.saveOrUpdate(one2); } + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setPrcName("加入标准化协会信息备案-入库流程结束"); + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java index f612e18d..869acb21 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java @@ -38,34 +38,22 @@ public class JSFAuditAfter implements TaskListener { if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("gcsFlag", 1); - if (StringUtils.isNotBlank(object.getString("statuteministerUser"))) { - - if (object.getString("statuteministerUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("statuteministerUser").split(",")); - } else { - nextUserList.add(object.getString("statuteministerUser")); - } - } + delegateTask.setVariable("statuteminister",delegateTask.getVariable("statuteminister1",String.class)); + nextUserList.add(delegateTask.getVariable("statuteminister1",String.class)); } else { - delegateTask.setVariable("gcsFlag", 2); - if (StringUtils.isNotBlank(object.getString("dockUser"))) { - delegateTask.setVariable("Standardizer2", object.getString("dockUser")); - nextUserList.add(object.getString("dockUser")); - } + delegateTask.setVariable("gcsFlag", 0); + delegateTask.setVariable("Standardizer2",delegateTask.getVariable("Standardizer1",String.class)); + nextUserList.add(delegateTask.getVariable("Standardizer1",String.class)); } //截止时间 流程描述 创建人 - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("prcCreateUser", user); - delegateTask.setVariable("prcCreateUserName", username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); - String prcName=""; + String user = delegateTask.getVariable("prcCreateUser", String.class); + String username = delegateTask.getVariable("prcCreateUserName",String.class); + String prcName; if(object.getString("signFlag").equals("1")) { - prcName = "-加入标准化协会信息备案-批准"; + prcName = "加入标准化协会信息备案-批准"; }else { - prcName = "-加入标准化协会信息备案-填写入会信息"; + prcName = "加入标准化协会信息备案-修改入会信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java index 8351933c..37423642 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java @@ -41,6 +41,7 @@ public class JSFFillinformationAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); + String approvalOpinion = object.get("dlFlag") == null ? "" : object.get("dlFlag").toString(); if ("1".equalsIgnoreCase(approvalOpinion)) { @@ -53,11 +54,12 @@ public class JSFFillinformationAfter implements TaskListener { busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); busProcessNew.setUserId(object.getString("passUser")); - busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busProcessNew.setPrcName("加入标准化协会信息备案-标准法规工程师审核"); busBean.save(busProcessNew); func1(delegateTask, busBean, object, "1"); delegateTask.setVariable("dlFlag", 1); + delegateTask.setVariable("statuteengineer",delegateTask.getVariable("prcCreateUser",String.class)); } else { delegateTask.setVariable("dlFlag", 0); func2(delegateTask, busBean, object, "0", busProcessNameService); @@ -81,7 +83,7 @@ public class JSFFillinformationAfter implements TaskListener { BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); if (one2 != null) { - //one2.setPrcName("入库流程结束"); +// one2.setPrcName("入库流程结束"); one2.setOverTime(OVERTIME); one2.setPrcType("1"); busProcessNameService.saveOrUpdate(one2); @@ -91,6 +93,7 @@ public class JSFFillinformationAfter implements TaskListener { queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); if (one1 != null) { + one1.setPrcName("加入标准化协会信息备案-流程结束"); one1.setCommitFlag(commitFlag); one1.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java index 04625532..8bf72c52 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java @@ -44,7 +44,10 @@ public class JSFstartAfter implements TaskListener { // 配置多实例 delegateTask.setVariable("Standardizer2list",nextUserList); - delegateTask.setVariable("Standardizer2", object.getString("dockUser")); + delegateTask.setVariable("Standardizer1", object.getString("dockUser")); + delegateTask.setVariable("statuteengineer1", object.getString("passUser")); + delegateTask.setVariable("statuteminister1", object.getString("directorUser")); + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java index ff7b7501..aa466e21 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java @@ -32,11 +32,13 @@ public class PRFApproveAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); + String approvalOpinion = object.get("bzFlag") == null ? "" : object.get("bzFlag").toString(); if ("1".equalsIgnoreCase(approvalOpinion)) { - delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); + delegateTask.setVariable("bzFlag", 1); + func1(delegateTask, busBean, object, "1", busProcessNameService); + } else { BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -44,41 +46,38 @@ public class PRFApproveAfter implements TaskListener { busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("LiabilityengineerUser")); - busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busProcessNew.setUserId(object.getString("sonUser")); + busProcessNew.setPrcName("参与外部标准制修订备案-修改入会信息"); busBean.save(busProcessNew); - - func1(delegateTask, busBean, object, "1"); + func2(delegateTask, busBean, object, "0"); delegateTask.setVariable("bzFlag", 2); - } else { - delegateTask.setVariable("bzFlag", 1); - func2(delegateTask, busBean, object, "0", busProcessNameService); + delegateTask.setVariable("Liabilityengineer",delegateTask.getVariable("Liabilityengineer1",String.class)); } } - private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { - QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("TASK_ID", delegateTask.getId()); - BusProcessNew one1 = busBean.getOne(queryWrapper1); - if (one1 != null) { - one1.setCommitFlag(commitFlag); - one1.setCommitText(object.getString("commentText")); - busBean.saveOrUpdate(one1); - } - } - - private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); if (one2 != null) { - one2.setPrcName("入库流程结束"); +// one2.setPrcName("入库流程结束"); one2.setOverTime(OVERTIME); one2.setPrcType("1"); busProcessNameService.saveOrUpdate(one2); } + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setPrcName("参与外部标准制修订备案-入库流程结束"); + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java index 30d27127..1a00c702 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java @@ -35,30 +35,15 @@ public class PRFEngineerreviewAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("statuteminister", object.getString("statuteministerUser")); - nextUserList.add(object.getString("statuteministerUser")); - delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); - nextUserList.add(object.getString("LiabilityengineerUser")); - -// 逻辑判断是否会签 signFlag if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("gcsFlag", 1); - if (StringUtils.isNotBlank(object.getString("statuteministerUser"))) { - - if (object.getString("statuteministerUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("statuteministerUser").split(",")); - } else { - nextUserList.add(object.getString("statuteministerUser")); - } - } + delegateTask.setVariable("statuteminister",delegateTask.getVariable("statuteminister1",String.class)); + nextUserList.add(delegateTask.getVariable("statuteminister1",String.class)); } else { delegateTask.setVariable("gcsFlag", 2); - if (StringUtils.isNotBlank(object.getString("LiabilityengineerUser"))) { - delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); - nextUserList.add(object.getString("LiabilityengineerUser")); - } + delegateTask.setVariable("Liabilityengineer",delegateTask.getVariable("Liabilityengineer1",String.class)); + nextUserList.add(delegateTask.getVariable("Liabilityengineer1",String.class)); } //截止时间 流程描述 创建人 @@ -72,7 +57,7 @@ public class PRFEngineerreviewAfter implements TaskListener { if(object.getString("signFlag").equals("1")) { prcName = standName + "-参与外部标准制修订备案-部长批准"; }else { - prcName = standName + "-参与外部标准制修订备案-填写备案信息"; + prcName = standName + "-参与外部标准制修订备案-修改备案信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java index 3d61c3cd..92c25931 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java @@ -12,7 +12,9 @@ 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; public class PRFFillinformationAfter implements TaskListener { @@ -32,46 +34,61 @@ public class PRFFillinformationAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("Buttpeople2", object.getString("Buttpeople2User")); - nextUserList.add(object.getString("Buttpeople2User")); + String approvalOpinion = object.get("dlFlag") == null ? "" : object.get("dlFlag").toString(); + if ("1".equalsIgnoreCase(approvalOpinion)) { - //截止时间 流程描述 创建人 - String user = object.getString("prcCreateUser"); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("prcCreateUser", user); - delegateTask.setVariable("prcCreateUserName", username); -// delegateTask.setVariable("stId",object.getString("projectNumber")); + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busProcessNew.setUserId(object.getString("passUser")); + busProcessNew.setPrcName("参与外部标准制修订备案-责任部门对接人审核"); + busBean.save(busProcessNew); - String prcName = delegateTask.getVariable("listName", String.class) + "-参与外部标准制修订备案-对接人审核"; + func1(delegateTask, busBean, object, "1"); + delegateTask.setVariable("dlFlag", 1); + delegateTask.setVariable("Buttpeople2",delegateTask.getVariable("Buttpeople3",String.class)); + } else { + delegateTask.setVariable("dlFlag", 2); + func2(delegateTask, busBean, object, "0", busProcessNameService); + } + } + + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); - BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); - - if(one1!=null){ - one1.setPrcType("14"); - one1.setPrcName(prcName); - one1.setCreatUser(user); - one1.setCreatUserName(username); - busProcessNameService.saveOrUpdate(one1); + BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + if (one2 != null) { + one2.setOverTime(OVERTIME); + one2.setPrcType("1"); + busProcessNameService.saveOrUpdate(one2); } - 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); - } + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setPrcName("参与外部标准制修订备案-流程结束"); + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java index 650a95d9..42c889ae 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java @@ -35,28 +35,15 @@ public class PRFReviewdockAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("statuteengineer", object.getString("statuteengi6neerUser")); - nextUserList.add(object.getString("statuteengineerUser")); - delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); - nextUserList.add(object.getString("LiabilityengineerUser")); if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("djrFlag", 1); - if (StringUtils.isNotBlank(object.getString("statuteengineerUser"))) { - - if (object.getString("statuteengineerUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("statuteengineerUser").split(",")); - } else { - nextUserList.add(object.getString("statuteengineerUser")); - } - } + delegateTask.setVariable("statuteengineer",delegateTask.getVariable("statuteengineer1",String.class)); + nextUserList.add(delegateTask.getVariable("statuteengineer1",String.class)); } else { delegateTask.setVariable("djrFlag", 2); - if (StringUtils.isNotBlank(object.getString("LiabilityengineerUser"))) { - delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); - nextUserList.add(object.getString("LiabilityengineerUser")); - } + delegateTask.setVariable("Liabilityengineer",delegateTask.getVariable("Liabilityengineer1",String.class)); + nextUserList.add(delegateTask.getVariable("Liabilityengineer1",String.class)); } //截止时间 流程描述 创建人 @@ -70,7 +57,7 @@ public class PRFReviewdockAfter implements TaskListener { if(object.getString("signFlag").equals("1")) { prcName = standName + "-参与外部标准制修订备案-工程师审核"; }else { - prcName = standName + "-参与外部标准制修订备案-填写备案信息"; + prcName = standName + "-参与外部标准制修订备案-修改备案信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java index 05946437..72a84b3c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java @@ -13,6 +13,7 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class PRFUnderengineerAfter implements TaskListener { @@ -33,13 +34,15 @@ public class PRFUnderengineerAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); + String ids=object.getString("sonUser"); + if(ids.contains(",")){ + nextUserList=new ArrayList<>(Arrays.asList(ids.split(","))); + }else { + nextUserList.add(ids); + } // 配置多实例 delegateTask.setVariable("Liabilityengineerlist",nextUserList); -// 赋值 - delegateTask.setVariable("Liabilityengineer", object.getString("sonUser")); - nextUserList.add(object.getString("sonUser")); - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java index 6e0aefe4..ab4313db 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java @@ -40,17 +40,22 @@ public class PRFstartAfter implements TaskListener { }else { nextUserList.add(ids); } + // 配置多实例 delegateTask.setVariable("Buttpeoplelist",nextUserList); + delegateTask.setVariable("Buttpeople3", object.getString("passUser")); + delegateTask.setVariable("Liabilityengineer1", object.getString("sonUser")); + delegateTask.setVariable("statuteengineer1", object.getString("statuteengineerUser")); + delegateTask.setVariable("statuteminister1", object.getString("statuteministerUser")); + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); -// delegateTask.setVariable("stId",object.getString("projectNumber")); - String prcName = delegateTask.getVariable("listName", String.class) + "-参与外部标准制修订备案-备案任务下发"; + String prcName = "参与外部标准制修订备案-备案任务下发"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java index ba7910f6..b3ca51b4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java @@ -36,10 +36,13 @@ public class RAApproveAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); + String approvalOpinion = object.get("yzFlag") == null ? "" : object.get("yzFlag").toString(); if ("1".equalsIgnoreCase(approvalOpinion)) { - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); + delegateTask.setVariable("yzFlag", 1); + func1(delegateTask, busBean, object, "1", busProcessNameService); + + } else { BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -47,41 +50,38 @@ public class RAApproveAfter implements TaskListener { busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("prcCreateUser")); - busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busProcessNew.setUserId(object.getJSONObject("roleForm").getString("passUser")); + busProcessNew.setPrcName("外部署名推荐批准-修改信息"); busBean.save(busProcessNew); - - func1(delegateTask, busBean, object, "1"); + func2(delegateTask, busBean, object, "0"); delegateTask.setVariable("yzFlag", 2); - } else { - delegateTask.setVariable("yzFlag", 1); - func2(delegateTask, busBean, object, "0", busProcessNameService); + delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class)); } } - private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { - QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("TASK_ID", delegateTask.getId()); - BusProcessNew one1 = busBean.getOne(queryWrapper1); - if (one1 != null) { - one1.setCommitFlag(commitFlag); - one1.setCommitText(object.getString("commentText")); - busBean.saveOrUpdate(one1); - } - } - - private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); if (one2 != null) { - one2.setPrcName("入库流程结束"); +// one2.setPrcName("入库流程结束"); one2.setOverTime(OVERTIME); one2.setPrcType("1"); busProcessNameService.saveOrUpdate(one2); } + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setPrcName("外部署名推荐批准-入库流程结束"); + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java index 24ddab89..cfc96133 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java @@ -34,30 +34,15 @@ public class RAAuditAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("director", object.getString("directorUser")); - nextUserList.add(object.getString("directorUser")); - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); - -// 逻辑判断 signFlag if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("bzFlag", 1); - if (StringUtils.isNotBlank(object.getString("directorUser"))) { - - if (object.getString("directorUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("directorUser").split(",")); - } else { - nextUserList.add(object.getString("directorUser")); - } - } + delegateTask.setVariable("director",delegateTask.getVariable("director1",String.class)); + nextUserList.add(delegateTask.getVariable("director1",String.class)); } else { delegateTask.setVariable("bzFlag", 2); - if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) { - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); - } + delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class)); + nextUserList.add(delegateTask.getVariable("statuteengineer3",String.class)); } //截止时间 流程描述 创建人 @@ -65,13 +50,11 @@ public class RAAuditAfter implements TaskListener { String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); String prcName=""; if(object.getString("signFlag").equals("1")) { - prcName = standName + "-外部署名推荐批准-审核"; + prcName = "外部署名推荐批准-审核"; }else { - prcName = standName + "-外部署名推荐批准-修改信息"; + prcName = "外部署名推荐批准-修改信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java index 2d79823b..199915d4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java @@ -32,11 +32,9 @@ public class RAModifyInformationAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("leadership", object.getString("dockUser")); - nextUserList.add(object.getString("dockUser")); - + delegateTask.setVariable("leadership",delegateTask.getVariable("leadership1",String.class)); + nextUserList.add(delegateTask.getVariable("leadership1",String.class)); //截止时间 流程描述 创建人 @@ -45,7 +43,7 @@ public class RAModifyInformationAfter implements TaskListener { delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String prcName = delegateTask.getVariable("listName", String.class) + "-外部署名推荐批准-署名领导会签"; + String prcName = "外部署名推荐批准-署名领导会签"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java index 6c2403c9..6010e552 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java @@ -34,28 +34,15 @@ public class RASignAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("statuteminister", object.getString("ministerUser")); - nextUserList.add(object.getString("ministerUser")); - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("ldFlag", 1); - if (StringUtils.isNotBlank(object.getString("ministerUser"))) { - - if (object.getString("ministerUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("ministerUser").split(",")); - } else { - nextUserList.add(object.getString("ministerUser")); - } - } + delegateTask.setVariable("statuteminister",delegateTask.getVariable("statuteminister1",String.class)); + nextUserList.add(delegateTask.getVariable("statuteminister1",String.class)); } else { - delegateTask.setVariable("ldFlag", 2); - if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) { - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); - } + delegateTask.setVariable("ldFlag", 2); + delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class)); + nextUserList.add(delegateTask.getVariable("statuteengineer3",String.class)); } //截止时间 流程描述 创建人 @@ -63,13 +50,11 @@ public class RASignAfter implements TaskListener { String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); String prcName=""; if(object.getString("signFlag").equals("1")) { - prcName = standName + "-外部署名推荐批准-审核"; + prcName = "外部署名推荐批准-审核"; }else { - prcName = standName + "-外部署名推荐批准-修改信息"; + prcName = "外部署名推荐批准-修改信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java index 122e8e0a..a7c3900d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java @@ -35,31 +35,15 @@ public class RAValidationAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("dean", object.getString("president")); - nextUserList.add(object.getString("president")); - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); - -// 逻辑判断是否审核 signFlag if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("zrFlag", 1); - - if (StringUtils.isNotBlank(object.getString("president"))) { - - if (object.getString("president").contains(",")) { - nextUserList = Arrays.asList(object.getString("president").split(",")); - } else { - nextUserList.add(object.getString("president")); - } - } + delegateTask.setVariable("dean",delegateTask.getVariable("dean1",String.class)); + nextUserList.add(delegateTask.getVariable("dean1",String.class)); } else { delegateTask.setVariable("zrFlag", 2); - if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) { - delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); - nextUserList.add(object.getString("prcCreateUser")); - } + delegateTask.setVariable("statuteengineer2",delegateTask.getVariable("statuteengineer3",String.class)); + nextUserList.add(delegateTask.getVariable("statuteengineer3",String.class)); } //截止时间 流程描述 创建人 @@ -67,13 +51,12 @@ public class RAValidationAfter implements TaskListener { String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); - String prcName=""; + + String prcName; if(object.getString("signFlag").equals("1")) { - prcName = standName + "-外部署名推荐批准-批准"; + prcName = "外部署名推荐批准-批准"; }else { - prcName = standName + "-外部署名推荐批准-修改信息"; + prcName = "外部署名推荐批准-修改信息"; } QueryWrapper queryWrapper2 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java index 56d0bb54..c4780aa4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java @@ -31,14 +31,23 @@ public class RAstartAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); + List nextUserList = new ArrayList(); + String ids= object.getJSONObject("roleForm").getString("dockUser"); + if(ids.contains(",")){ + nextUserList=new ArrayList<>(Arrays.asList(ids.split(","))); + }else { + nextUserList.add(ids); + } // 配置多实例 delegateTask.setVariable("leadershiplist",nextUserList); // 赋值 - delegateTask.setVariable("leadership", object.getString("dockUser")); - nextUserList.add(object.getString("dockUser")); - + delegateTask.setVariable("leadership1", object.getJSONObject("roleForm").getString("dockUser")); + delegateTask.setVariable("director1", object.getJSONObject("roleForm").getString("directorUser")); + delegateTask.setVariable("statuteminister1", object.getJSONObject("roleForm").getString("ministerUser")); + delegateTask.setVariable("dean1", object.getJSONObject("roleForm").getString("president")); + delegateTask.setVariable("statuteengineer3", object.getJSONObject("roleForm").getString("passUser")); //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); @@ -46,7 +55,7 @@ public class RAstartAfter implements TaskListener { delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String prcName = delegateTask.getVariable("listName", String.class) + "-外部署名推荐批准-署名领导会签"; + String prcName = "外部署名推荐批准-署名领导会签"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); From e547e0b2c8c7177c6693e79acb4ebde64e2d42ab Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 1 Nov 2021 14:48:13 +0800 Subject: [PATCH 12/17] =?UTF-8?q?zcr:=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=8F=82=E4=BC=9A=20=E5=AE=8C=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/StandardAfterMeetProcess/AutoStartAfter.java | 2 +- .../listener/StandardAfterMeetProcess/DirectorVerifyAfter.java | 2 +- .../StandardAfterMeetProcess/MemberUploadInfoAfter.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 index 7a031ea2..bc386aa2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java @@ -42,7 +42,7 @@ public class AutoStartAfter implements TaskListener { if(StringUtils.isNotBlank(object.getString("member"))) { prcName = prcName + "参会人上传会议资料，填写标准及议题"; nextUserList.add(object.getString("member")); - delegateTask.setVariable("member", nextUserList); + delegateTask.setVariable("member", object.getString("member")); } 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 index fba39742..6f0bf4f3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java @@ -50,7 +50,7 @@ public class DirectorVerifyAfter implements TaskListener { prcName = prcName + "参会人上传会议资料，填写标准及议题"; if(StringUtils.isNotBlank(object.getString("member"))) { nextUserList.add(object.getString("member")); - delegateTask.setVariable("member", nextUserList); + delegateTask.setVariable("member", object.getString("member")); } } 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 index 0f544606..7545fa58 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java @@ -42,7 +42,7 @@ public class MemberUploadInfoAfter implements TaskListener { if(StringUtils.isNotBlank(object.getString("director"))) { prcName = prcName + "标准法规业务主管批准"; nextUserList.add(object.getString("director")); - delegateTask.setVariable("director", nextUserList); + delegateTask.setVariable("director", object.getString("director")); } //截止时间 流程描述 创建人 From a6df825a75a84b3613da42b0d02166a119b3a9a5 Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Wed, 3 Nov 2021 14:39:56 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PRFApproveAfter.java | 51 +++++++++++---- .../PRFEngineerreviewAfter.java | 6 +- .../PRFFillinformationAfter.java | 65 +++++++++++-------- .../PRFReviewdockAfter.java | 6 +- .../PRFUnderengineerAfter.java | 6 +- .../PRFstartAfter.java | 11 ++-- .../PRFstartBefore.java | 10 +-- .../RecommendedApproval/RAstartAfter.java | 1 + 8 files changed, 91 insertions(+), 65 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java index aa466e21..dc919626 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java @@ -13,7 +13,9 @@ 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; public class PRFApproveAfter implements TaskListener { @Override @@ -31,7 +33,7 @@ public class PRFApproveAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - + List nextUserList = new ArrayList(); String approvalOpinion = object.get("bzFlag") == null ? "" : object.get("bzFlag").toString(); if ("1".equalsIgnoreCase(approvalOpinion)) { @@ -39,19 +41,44 @@ public class PRFApproveAfter implements TaskListener { func1(delegateTask, busBean, object, "1", busProcessNameService); } else { - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("sonUser")); - busProcessNew.setPrcName("参与外部标准制修订备案-修改入会信息"); - busBean.save(busProcessNew); - func2(delegateTask, busBean, object, "0"); delegateTask.setVariable("bzFlag", 2); delegateTask.setVariable("Liabilityengineer",delegateTask.getVariable("Liabilityengineer1",String.class)); + nextUserList.add(delegateTask.getVariable("Liabilityengineer1",String.class)); + } + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("prcCreateUser", user); + delegateTask.setVariable("prcCreateUserName", username); + String prcName=""; + if(object.get("bzFlag").equals("2")) { + prcName = "参与外部标准制修订备案-修改备案信息"; + } + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + + if(one1!=null){ + one1.setPrcType("14"); + 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/ParticipateRevisionFiling/PRFEngineerreviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java index 1a00c702..6bf83071 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java @@ -51,13 +51,11 @@ public class PRFEngineerreviewAfter implements TaskListener { String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); String prcName=""; if(object.getString("signFlag").equals("1")) { - prcName = standName + "-参与外部标准制修订备案-部长批准"; + prcName = "参与外部标准制修订备案-部长批准"; }else { - prcName = standName + "-参与外部标准制修订备案-修改备案信息"; + prcName = "参与外部标准制修订备案-修改备案信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java index 92c25931..344b313a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java @@ -34,42 +34,53 @@ public class PRFFillinformationAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - - String approvalOpinion = object.get("dlFlag") == null ? "" : object.get("dlFlag").toString(); - - if ("1".equalsIgnoreCase(approvalOpinion)) { - - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setMsgType("clause"); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setMesg(object.toJSONString()); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("passUser")); - busProcessNew.setPrcName("参与外部标准制修订备案-责任部门对接人审核"); - busBean.save(busProcessNew); - - func1(delegateTask, busBean, object, "1"); + List nextUserList = new ArrayList(); + if (object.getString("signFlag").equals("1")) { delegateTask.setVariable("dlFlag", 1); - delegateTask.setVariable("Buttpeople2",delegateTask.getVariable("Buttpeople3",String.class)); + delegateTask.setVariable("Buttpeople2", delegateTask.getVariable("Buttpeople3", String.class)); + nextUserList.add(delegateTask.getVariable("Buttpeople3", String.class)); } else { delegateTask.setVariable("dlFlag", 2); func2(delegateTask, busBean, object, "0", busProcessNameService); } - } - private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { - QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("TASK_ID", delegateTask.getId()); - BusProcessNew one1 = busBean.getOne(queryWrapper1); + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("prcCreateUser", user); + delegateTask.setVariable("prcCreateUserName", username); + String prcName = ""; + if (object.getString("signFlag").equals("1")) { + prcName = "参与外部标准制修订备案-责任部门对接人审核"; + } + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { - one1.setCommitFlag(commitFlag); - one1.setCommitText(object.getString("commentText")); - busBean.saveOrUpdate(one1); + one1.setPrcType("14"); + 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); + } } } - private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java index 42c889ae..c6caf2ad 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java @@ -51,13 +51,11 @@ public class PRFReviewdockAfter implements TaskListener { String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); String prcName=""; if(object.getString("signFlag").equals("1")) { - prcName = standName + "-参与外部标准制修订备案-工程师审核"; + prcName = "参与外部标准制修订备案-工程师审核"; }else { - prcName = standName + "-参与外部标准制修订备案-修改备案信息"; + prcName = "参与外部标准制修订备案-修改备案信息"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java index 72a84b3c..11db796f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java @@ -34,7 +34,7 @@ public class PRFUnderengineerAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); - String ids=object.getString("sonUser"); + String ids=object.getString("workPeople"); if(ids.contains(",")){ nextUserList=new ArrayList<>(Arrays.asList(ids.split(","))); }else { @@ -43,14 +43,14 @@ public class PRFUnderengineerAfter implements TaskListener { // 配置多实例 delegateTask.setVariable("Liabilityengineerlist",nextUserList); - + delegateTask.setVariable("Liabilityengineer1", object.getString("workPeople")); //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String prcName = delegateTask.getVariable("listName", String.class) + "-参与外部标准制修订备案-填写备案信息"; + String prcName = "参与外部标准制修订备案-填写备案信息"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java index ab4313db..1ae288ae 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java @@ -34,7 +34,7 @@ public class PRFstartAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); - String ids=object.getString("creatUser"); + String ids=object.getString("dockUser"); if(ids.contains(",")){ nextUserList=new ArrayList<>(Arrays.asList(ids.split(","))); }else { @@ -42,12 +42,11 @@ public class PRFstartAfter implements TaskListener { } // 配置多实例 - delegateTask.setVariable("Buttpeoplelist",nextUserList); + delegateTask.setVariable("Buttpeople1list",nextUserList); - delegateTask.setVariable("Buttpeople3", object.getString("passUser")); - delegateTask.setVariable("Liabilityengineer1", object.getString("sonUser")); - delegateTask.setVariable("statuteengineer1", object.getString("statuteengineerUser")); - delegateTask.setVariable("statuteminister1", object.getString("statuteministerUser")); + delegateTask.setVariable("Buttpeople3", object.getString("dockUser")); + delegateTask.setVariable("statuteengineer1", object.getString("firstUser")); + delegateTask.setVariable("statuteminister1", object.getString("directorUser")); //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartBefore.java index f73c5099..a86e1d6a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartBefore.java @@ -6,15 +6,7 @@ import org.activiti.engine.delegate.TaskListener; public class PRFstartBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { -// IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); -// QueryWrapper queryWrapper1 = new QueryWrapper(); -// queryWrapper1.isNull("TASK_ID"); -// List list = busBean.list(queryWrapper1); -// if(!list.isEmpty()){ -// BusProcessNew one1 = list.get(0); -// one1.setTaskId(delegateTask.getId()); -// busBean.saveOrUpdate(one1); -// } + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java index c4780aa4..48997e50 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java @@ -12,6 +12,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; //外部署名推荐批准 public class RAstartAfter implements TaskListener { From a4e1a1116b59664ed4ea59b572d2ef97853bdb18 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 4 Nov 2021 10:17:25 +0800 Subject: [PATCH 14/17] =?UTF-8?q?zcr:=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E4=BC=9A=E5=90=8E=E6=B5=81=E7=A8=8B=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8F=91=E8=B5=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../datas/controller/BusProcessNewController.java | 7 +++++++ .../datas/mapper/BusProcessNewMapper.java | 2 ++ .../datas/service/IBusProcessNewService.java | 2 ++ .../service/impl/BusProcessNewServiceImpl.java | 5 +++++ .../listener/RecommendedApproval/RAstartAfter.java | 1 + .../StandardAfterMeetProcess/AutoStartAfter.java | 13 +++++++++---- .../DirectorVerifyAfter.java | 2 ++ .../EngineerReviseDoneAfter.java | 8 +++++--- .../resources/mapper/datas/BusProcessNewMapper.xml | 12 ++++++++++++ 9 files changed, 45 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java index e589fd93..d0638029 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java @@ -54,6 +54,13 @@ public class BusProcessNewController extends BaseAction { return findtodotask; } + @ApiOperation(value = "每天十点需要启动 标准化活动参会流程") + @GetMapping("/everyDayTenOlockSAM") + public List everyDayTenOlockSAM() { + List findtodotask = iBusProcessNewService.everyDayTenOlockSAM(); + return findtodotask; + } + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java index 250e500a..cc446b52 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java @@ -30,4 +30,6 @@ public interface BusProcessNewMapper extends BaseMapper { List everyDayTenOlock(); + List everyDayTenOlockSAM(); + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java index c699cf84..688fd2c1 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java @@ -34,4 +34,6 @@ public interface IBusProcessNewService extends IService { List everyDayTenOlock(); + List everyDayTenOlockSAM(); + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java index 85e6da57..90bb6c40 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java @@ -78,4 +78,9 @@ public class BusProcessNewServiceImpl extends ServiceImpl everyDayTenOlock() { return baseMapper.everyDayTenOlock(); } + + @Override + public List everyDayTenOlockSAM() { + return baseMapper.everyDayTenOlockSAM(); + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java index c4780aa4..48997e50 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java @@ -12,6 +12,7 @@ import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; //外部署名推荐批准 public class RAstartAfter implements TaskListener { 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 index bc386aa2..3d99d30a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java @@ -39,12 +39,17 @@ public class AutoStartAfter implements TaskListener { List nextUserList = new ArrayList(); String prcName ="标准化活动会后流程-"; - if(StringUtils.isNotBlank(object.getString("member"))) { - prcName = prcName + "参会人上传会议资料，填写标准及议题"; - nextUserList.add(object.getString("member")); + prcName = prcName + "参会人上传会议资料，填写标准及议题"; + if ("1".equals(object.getString("auto"))){ delegateTask.setVariable("member", object.getString("member")); + nextUserList.add(object.getString("member")); + } + else { + if (StringUtils.isNotBlank(object.getString("memberId"))) { + delegateTask.setVariable("member", object.getString("memberId")); + nextUserList.add(object.getString("memberId")); + } } - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); 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 index 6f0bf4f3..3e4ca1cb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java @@ -51,6 +51,8 @@ public class DirectorVerifyAfter implements TaskListener { if(StringUtils.isNotBlank(object.getString("member"))) { nextUserList.add(object.getString("member")); delegateTask.setVariable("member", object.getString("member")); + }else{ + nextUserList.add(delegateTask.getVariable("member",String.class)); } } 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 c71ef580..2ff9da91 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 @@ -29,7 +29,6 @@ public class EngineerReviseDoneAfter implements TaskListener { 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()); @@ -42,7 +41,10 @@ public class EngineerReviseDoneAfter implements TaskListener { // prcName = "标准化活动参会流程-" + "会议结束"; prcName = prcName + "流程结束"; - + //把ch_pageData(前端的) 中的 meetingStartTime取出，放入最外层大JSON里(object) +// JSONObject o1 = object.getJSONObject("ch_pageData"); +// String meetingStartTime = o1.getString("meetingStartTime"); +// object.put("meetingStartTime",meetingStartTime); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); @@ -86,7 +88,7 @@ public class EngineerReviseDoneAfter implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setTaskInfo("标准化活动参会流程-流程结束"); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } diff --git a/src/main/resources/mapper/datas/BusProcessNewMapper.xml b/src/main/resources/mapper/datas/BusProcessNewMapper.xml index 56294e89..f2c9bf4e 100644 --- a/src/main/resources/mapper/datas/BusProcessNewMapper.xml +++ b/src/main/resources/mapper/datas/BusProcessNewMapper.xml @@ -45,4 +45,16 @@ CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and TASK_INFO = '政策课题组参会流程-流程结束' + + From 54477f3784d6703fad8d4a65feb79ea50f630ba6 Mon Sep 17 00:00:00 2001 From: Kevin Date: Thu, 11 Nov 2021 16:12:54 +0800 Subject: [PATCH 15/17] =?UTF-8?q?zcr:=E6=97=A5=E5=8E=86--=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=8C=96=E4=BC=9A=E8=AE=AE=E6=97=A5=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_auth/LawsUserInfoService.java | 24 +++++++--- .../wkflow/business_slrs/dao/SapMeeting.java | 44 +++++++++++++++++++ .../EngineerReviseDoneAfter.java | 38 +++++++++++++--- .../WriteMaterialAfter.java | 2 - 4 files changed, 96 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SapMeeting.java diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 07a67b75..fb88fef0 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -1,17 +1,14 @@ package com.ydw.bat.wkflow.business_auth; -import com.github.pagehelper.PageInfo; -import com.tmsps.fk.common.wrapper.Wrapper; + import com.ydw.bat.wkflow.business_main.datas.dto.*; import com.ydw.bat.wkflow.business_main.datas.entity.*; import com.ydw.bat.wkflow.business_slrs.dao.*; -import feign.Headers; -import org.apache.ibatis.annotations.Param; import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.format.annotation.DateTimeFormat; import org.springframework.stereotype.Component; import org.springframework.web.bind.annotation.*; -import javax.validation.constraints.NotNull; import java.util.Date; import java.util.List; import java.util.Map; @@ -125,5 +122,22 @@ public interface LawsUserInfoService { + @PostMapping("/sapMeetInfo/addMeeting") + public int addMeeting(@RequestBody SapMeeting sapMeeting); + + @GetMapping("/sapMeetInfo/getMeetingsByMonth") + public List getMeetingsByMonth(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date); + + @GetMapping("/sapMeetInfo/getMeetingsByMonthType") + public List getMeetingsByMonthType(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("type") int type); + + @GetMapping("/sapMeetInfo/getMeetingsByDate") + public List getMeetingsByDate(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("type") int type); + + @GetMapping("/sapMeetInfo/getOneById") + public SapMeeting getOneById(@RequestParam("id") String id); + + @PostMapping("/sapMeetInfo/getDateMeeting") + public int getDateMeeting(@RequestParam("date") @DateTimeFormat(pattern = "yyyy-MM-dd") Date date,@RequestParam("id") String id,@RequestParam("type") int type); } diff --git a/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SapMeeting.java b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SapMeeting.java new file mode 100644 index 00000000..47d271d2 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/business_slrs/dao/SapMeeting.java @@ -0,0 +1,44 @@ +package com.ydw.bat.wkflow.business_slrs.dao; + +import io.swagger.annotations.ApiModel; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.experimental.Accessors; +import org.springframework.format.annotation.DateTimeFormat; + +import java.util.Date; + +/** + *

+ * 流程通过的 标准化活动会议信息表 +standard_activity_pass + + *

+ * + * @author super_liu + * @since 2021-11-09 + */ +@Data +@Accessors(chain = true) +@ApiModel(value="SapMeeting对象", description="流程通过的 标准化活动会议信息表 standard_activity_pass") +public class SapMeeting { + + private static final long serialVersionUID = 1L; + + private String id;//主键-会议id + + private String title;//会议标题 + + @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + private Date date;//会议开始时间 + + private String content;//会议内容大纲 + + private int type;//标志位--1标准化活动会议,0政策组会议 + + private String attend;//参与人 {id,name} json + + private String files;//附件 json + + +} 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 2ff9da91..008f6c6a 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 @@ -1,5 +1,7 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +import com.alibaba.fastjson.JSON; +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; @@ -9,6 +11,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.business_slrs.dao.SapMeeting; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; @@ -17,6 +20,7 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.List; +import java.util.UUID; /** * EngineerReviseDone - 标准法规工程师汇总修订 @@ -27,6 +31,8 @@ public class EngineerReviseDoneAfter implements TaskListener { IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); //流程节点信息 IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + //存储会议信息 + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); //根据流程id找到流程信息 @@ -38,13 +44,8 @@ public class EngineerReviseDoneAfter implements TaskListener { List nextUserList = new ArrayList(); String prcName = "标准化活动参会流程-"; -// prcName = "标准化活动参会流程-" + "会议结束"; prcName = prcName + "流程结束"; - //把ch_pageData(前端的) 中的 meetingStartTime取出，放入最外层大JSON里(object) -// JSONObject o1 = object.getJSONObject("ch_pageData"); -// String meetingStartTime = o1.getString("meetingStartTime"); -// object.put("meetingStartTime",meetingStartTime); //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); @@ -83,6 +84,31 @@ public class EngineerReviseDoneAfter implements TaskListener { busBean.save(busProcessNewNext); } }else { + JSONObject json = object.getJSONObject("ch_pageData"); + JSONArray attends = json.getJSONArray("myPartRole"); + JSONArray files = json.getJSONArray("fileTextList"); + JSONArray tables = json.getJSONArray("meetingTable"); + StringBuilder contents = new StringBuilder(); + for(Object table : tables){ + JSONObject t = (JSONObject) table; + if(t.getString("meetingTheme") != null){ + if(contents.length() > 0){ + contents.append(";").append(t.getString("meetingTheme")); + }else{ + contents.append(t.getString("meetingTheme")); + } + } + } + + SapMeeting sapMeeting= new SapMeeting(); + sapMeeting.setTitle(json.getString("meetingName")); + sapMeeting.setDate(json.getDate("meetingStartTime")); + sapMeeting.setType(1); + sapMeeting.setId(UUID.randomUUID().toString()); + sapMeeting.setAttend(attends.toJSONString()); + sapMeeting.setFiles(files.toJSONString()); + sapMeeting.setContent(contents.toString()); + BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -91,6 +117,8 @@ public class EngineerReviseDoneAfter implements TaskListener { busProcessNewNext.setTaskInfo("标准化活动参会流程-流程结束"); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); + lawsUserInfoService.addMeeting(sapMeeting); + } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java index dac7d739..b877c8b0 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 @@ -30,8 +30,6 @@ public class WriteMaterialAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); From 9ffca259c19663d18f9e030294a02f458d497409 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Tue, 16 Nov 2021 17:06:13 +0800 Subject: [PATCH 16/17] =?UTF-8?q?=E6=96=B0=E6=B5=81=E7=A8=8B=E4=BB=A5?= =?UTF-8?q?=E5=8F=8A=E5=B7=B2=E5=8F=91=E5=92=8C=E5=B7=B2=E5=8A=9E=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E6=9F=A5=E8=AF=A2=E7=9A=84=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 20 +-- .../datas/mapper/BusProcessNewMapper.java | 2 + .../datas/service/IBusProcessNewService.java | 1 + .../impl/BusProcessNewServiceImpl.java | 5 + .../PCAffLiableDistributeAfter.java | 9 +- .../listener/aboliish/ProcessStep1After.java | 82 ++++++++++++ .../listener/aboliish/ProcessStep1Before.java | 36 ++++++ .../listener/aboliish/ProcessStep2After.java | 82 ++++++++++++ .../listener/aboliish/ProcessStep2Before.java | 36 ++++++ .../listener/aboliish/ProcessStep3After.java | 72 +++++++++++ .../listener/aboliish/ProcessStep3Before.java | 36 ++++++ .../listener/aboliish/ProcessStep4After.java | 83 ++++++++++++ .../listener/aboliish/ProcessStep4Before.java | 36 ++++++ .../listener/aboliish/ProcessStep5After.java | 83 ++++++++++++ .../listener/aboliish/ProcessStep5Before.java | 36 ++++++ .../listener/aboliish/ProcessStep6After.java | 91 ++++++++++++++ .../listener/aboliish/ProcessStep6Before.java | 36 ++++++ .../listener/aboliish/ProcessstartAfter.java | 75 +++++++++++ .../listener/aboliish/ProcessstartBefore.java | 13 ++ .../ProcessStep1After.java | 78 ++++++++++++ .../ProcessStep1Before.java | 36 ++++++ .../ProcessStep2After.java | 98 +++++++++++++++ .../ProcessStep2Before.java | 36 ++++++ .../ProcessStep3After.java | 118 ++++++++++++++++++ .../ProcessStep3Before.java | 36 ++++++ .../ProcessstartAfter.java | 78 ++++++++++++ .../ProcessstartBefore.java | 13 ++ .../ProcessStep1After.java | 89 +++++++++++++ .../ProcessStep1Before.java | 36 ++++++ .../ProcessStep2After.java | 92 ++++++++++++++ .../ProcessStep2Before.java | 36 ++++++ .../ProcessStep3After.java | 82 ++++++++++++ .../ProcessStep3Before.java | 36 ++++++ .../ProcessStep4After.java | 90 +++++++++++++ .../ProcessStep4Before.java | 36 ++++++ .../ProcessstartAfter.java | 76 +++++++++++ .../ProcessstartBefore.java | 13 ++ .../mapper/datas/BusProcessNewMapper.xml | 5 + 38 files changed, 1909 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessstartAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessstartBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4Before.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index c7e9e76f..ca0db7f0 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -1964,10 +1964,12 @@ public class TodoTaskController extends BaseAction { queryWrapper1.eq("P_ID",busProcessName.getPrcId()); queryWrapper1.eq("TASK_ID",task.getId()); BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1); - if (null!=busProcessNew.getPrcName()){ - busProcessName.setPrcName(busProcessNew.getPrcName()); - }else { - busProcessNew.setPrcName(""); + if (null!=busProcessNew) { + if (null != busProcessNew.getPrcName()) { + busProcessName.setPrcName(busProcessNew.getPrcName()); + } else { + busProcessNew.setPrcName(""); + } } } @@ -2085,10 +2087,12 @@ public class TodoTaskController extends BaseAction { queryWrapper1.eq("P_ID",busProcessName.getPrcId()); queryWrapper1.eq("TASK_ID",task.getId()); BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1); - if (null!=busProcessNew.getPrcName()){ - busProcessName.setPrcName(busProcessNew.getPrcName()); - }else { - busProcessNew.setPrcName(""); + if (null!=busProcessNew) { + if (null != busProcessNew.getPrcName()) { + busProcessName.setPrcName(busProcessNew.getPrcName()); + } else { + busProcessNew.setPrcName(""); + } } } } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java index cc446b52..9743050e 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java @@ -28,6 +28,8 @@ public interface BusProcessNewMapper extends BaseMapper { List findLastworkPeople(@Param("key")String key,@Param("pId")String pId); + List findLastworkPeople2(@Param("key")String key,@Param("pId")String pId); + List everyDayTenOlock(); List everyDayTenOlockSAM(); diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java index 688fd2c1..d9607774 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java @@ -31,6 +31,7 @@ public interface IBusProcessNewService extends IService { List findNoExecuteBusProcessNewForEnd(List taskIdList); //子流程 获取 阶段数据 专用 BY yzh List findLastworkPeople(@Param("key")String key, @Param("pId")String pId); + List findLastworkPeople2(@Param("key")String key, @Param("pId")String pId); List everyDayTenOlock(); diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java index 90bb6c40..78d5e51c 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java @@ -74,6 +74,11 @@ public class BusProcessNewServiceImpl extends ServiceImpl findLastworkPeople2(String key, String pId) { + return baseMapper.findLastworkPeople2(key,pId); + } + @Override public List everyDayTenOlock() { return baseMapper.everyDayTenOlock(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java index 151b30c7..963d8c5c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistributeAfter.java @@ -62,20 +62,27 @@ public class PCAffLiableDistributeAfter implements TaskListener { int flag=0; for (PCAdataList ps: map.get(o.getWorkPeopleId()).getDataList()) { if (ps.getStandId().equals(mapData.get(o.getKey()).getStandId())){ + ps.getChildren().add(o); flag++; } } + if (flag==0){ + map.get(o.getWorkPeopleId()).getDataList().add(mapData.get(o.getKey())); + mapData.get(o.getKey()).getChildren().add(o); + } }else { PCAtotal pcs=new PCAtotal(); BeanUtils.copyProperties(pcAtotal,pcs); //建立空的子 为了后面遍历 List list=new ArrayList<>(); + List list1=new ArrayList<>(); list.add(o); + list1.add(o); pcs.setChildren(list); List list2=new ArrayList<>(); PCAdataList adataLists=new PCAdataList(); BeanUtils.copyProperties(mapData.get(o.getKey()),adataLists); - adataLists.setChildren(list); + adataLists.setChildren(list1); list2.add(adataLists); pcs.setDataList(list2); map.put(o.getWorkPeopleId(),pcs); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java new file mode 100644 index 00000000..c85dd322 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1After.java @@ -0,0 +1,82 @@ +package com.ydw.bat.wkflow.listener.aboliish; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class ProcessStep1After 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); + + //根据流程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); + //标准法规部业务经理Id ${passFlag==1} + List nextUserList = new ArrayList(); + if ("1".equals(object.getString("passFlag"))){ + delegateTask.setVariable("passFlag","1"); + }else { + if (object.getString("workPeopleList").contains(",")){ + nextUserList = new ArrayList<>(Arrays.asList(object.getString("workPeopleList").split(","))); + }else { + nextUserList.add(object.getString("workPeopleList")); + } + delegateTask.setVariable("workPeopleList",nextUserList); + delegateTask.setVariable("passFlag","0"); + } + + //截止时间 流程描述 创建人 + String user = delegateTask.getVariable("prcCreateUser",String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + String prcName = "企标复审流程-工作组成员标准复审"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("24"); + 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/aboliish/ProcessStep1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1Before.java new file mode 100644 index 00000000..e763a98a --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep1Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.aboliish; + +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 ProcessStep1Before implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java new file mode 100644 index 00000000..9c23a4bd --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2After.java @@ -0,0 +1,82 @@ +package com.ydw.bat.wkflow.listener.aboliish; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class ProcessStep2After 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); + + //根据流程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); + //标准法规部业务经理Id ${passFlag==1} + List nextUserList = new ArrayList(); + if (null == delegateTask.getVariable("count")){ + delegateTask.setVariable("count",delegateTask.getVariable("workPeopleList",List.class).size()); + } + if (delegateTask.getVariable("count",Integer.class)==1){ + //对数据进行处理 需要等到调试的时候才能编写 bzfgLeaderId + + }else { + delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)-1); + } + nextUserList.add(object.getString("qcId")); + delegateTask.setVariable("qcId",object.getString("qcId")); + + //截止时间 流程描述 创建人 + String user = delegateTask.getVariable("prcCreateUser",String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + String prcName = "企标复审流程-起草人修改标准状态"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("24"); + 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/aboliish/ProcessStep2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2Before.java new file mode 100644 index 00000000..1d900501 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep2Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.aboliish; + +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 ProcessStep2Before implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java new file mode 100644 index 00000000..b1bf8d7a --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3After.java @@ -0,0 +1,72 @@ +package com.ydw.bat.wkflow.listener.aboliish; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.ArrayList; +import java.util.List; + +public class ProcessStep3After 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); + + //根据流程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); + //标准法规部业务经理Id ${passFlag==1} + List nextUserList = new ArrayList(); + nextUserList.add(object.getString("bzfgLeaderId")); + delegateTask.setVariable("bzfgLeaderId",object.getString("bzfgLeaderId")); + + //截止时间 流程描述 创建人 + String user = delegateTask.getVariable("prcCreateUser",String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + String prcName = "企标复审流程-标准法规部部长审核"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("24"); + 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/aboliish/ProcessStep3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3Before.java new file mode 100644 index 00000000..e9f7d55b --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep3Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.aboliish; + +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 ProcessStep3Before implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java new file mode 100644 index 00000000..50efea02 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4After.java @@ -0,0 +1,83 @@ +package com.ydw.bat.wkflow.listener.aboliish; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.ArrayList; +import java.util.List; + +public class ProcessStep4After 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); + + //根据流程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); + //标准法规部业务经理Id ${passFlag==1} + List nextUserList = new ArrayList(); + if ("0".equals(object.getString("bzFlag"))){ + nextUserList.add(object.getString("sdId")); + delegateTask.setVariable("sdId",object.getString("sdId")); + delegateTask.setVariable("bzFlag","0"); + }else { + delegateTask.setVariable("bzFlag","1"); + nextUserList.add(delegateTask.getVariable("qcId",String.class)); + } + + //截止时间 流程描述 创建人 + String user = delegateTask.getVariable("prcCreateUser",String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + String prcName=""; + if ("0".equals(object.getString("bzFlag"))){ + prcName = "企标复审流程-审定责任人审定"; + }else { + prcName = "企标复审流程-起草人修改标准状态"; + } + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("24"); + 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/aboliish/ProcessStep4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4Before.java new file mode 100644 index 00000000..d6404920 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep4Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.aboliish; + +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 ProcessStep4Before implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java new file mode 100644 index 00000000..c91793c4 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5After.java @@ -0,0 +1,83 @@ +package com.ydw.bat.wkflow.listener.aboliish; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.ArrayList; +import java.util.List; + +public class ProcessStep5After 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); + + //根据流程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); + //标准法规部业务经理Id ${sdFlag==0} bafzFlag + List nextUserList = new ArrayList(); + if ("0".equals(object.getString("sdFlag"))){ + delegateTask.setVariable("bzfzId",object.getString("bzfzId")); + delegateTask.setVariable("sdFlag","0"); + nextUserList.add(delegateTask.getVariable("bzfzId",String.class)); + }else { + delegateTask.setVariable("sdFlag","1"); + nextUserList.add(delegateTask.getVariable("qcId",String.class)); + } + + //截止时间 流程描述 创建人 + String user = delegateTask.getVariable("prcCreateUser",String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + String prcName = ""; + if ("0".equals(object.getString("sdFlag"))){ + prcName = "企标复审流程-批准负责人审批"; + }else { + prcName = "企标复审流程-起草人修改标准状态"; + } + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("24"); + 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/aboliish/ProcessStep5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5Before.java new file mode 100644 index 00000000..0b3a7f4c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep5Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.aboliish; + +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 ProcessStep5Before implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java new file mode 100644 index 00000000..b0924d4d --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6After.java @@ -0,0 +1,91 @@ +package com.ydw.bat.wkflow.listener.aboliish; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.ArrayList; +import java.util.List; + +public class ProcessStep6After 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); + + //根据流程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); + //标准法规部业务经理Id ${sdFlag==0} bafzFlag + List nextUserList = new ArrayList(); + if ("0".equals(object.getString("sdFlag"))){ + delegateTask.setVariable("sdFlag","0"); + }else { + delegateTask.setVariable("sdFlag","1"); + nextUserList.add(delegateTask.getVariable("qcId",String.class)); + } + + //截止时间 流程描述 创建人 + String user = delegateTask.getVariable("prcCreateUser",String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + String prcName = ""; + if ("0".equals(object.getString("sdFlag"))){ + prcName = "企标复审流程-批准负责人审批"; + }else { + prcName = "企标复审流程-起草人修改标准状态"; + } + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("24"); + 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); + } + }else { + 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.setPrcName("流程结束"); + busBean.save(busProcessNewNext); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6Before.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6Before.java new file mode 100644 index 00000000..e9f25817 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessStep6Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.aboliish; + +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 ProcessStep6Before implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartAfter.java new file mode 100644 index 00000000..0e442e00 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartAfter.java @@ -0,0 +1,75 @@ +package com.ydw.bat.wkflow.listener.aboliish; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.ArrayList; +import java.util.List; + +public class ProcessstartAfter 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); + + //根据流程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); + //标准法规部业务经理Id + List nextUserList = new ArrayList(); + nextUserList.add(object.getString("bzfgLeaderId")); + delegateTask.setVariable("bzfgLeaderId",object.getString("bzfgLeaderId")); + + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("prcCreateUser", user); + delegateTask.setVariable("prcCreateUserName", username); + String prcName = "企标废止流程-标准法规部部长审核"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("24"); + 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/aboliish/ProcessstartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartBefore.java new file mode 100644 index 00000000..d482e216 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/aboliish/ProcessstartBefore.java @@ -0,0 +1,13 @@ +package com.ydw.bat.wkflow.listener.aboliish; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class ProcessstartBefore implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1After.java new file mode 100644 index 00000000..bb76be12 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1After.java @@ -0,0 +1,78 @@ +package com.ydw.bat.wkflow.listener.enterpriseBidReviewProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class ProcessStep1After 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); + + //根据流程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); + //标准法规部业务经理Id + List nextUserList = new ArrayList(); + if (object.getString("jgUserId").contains(",")) { + nextUserList=new ArrayList<>(Arrays.asList(object.getString("jgUserId").split(","))); + }else { + nextUserList.add(object.getString("jgUserId")); + } + delegateTask.setVariable("workPeopleList",nextUserList); + + + //截止时间 流程描述 创建人 + String user = delegateTask.getVariable("prcCreateUser",String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + String prcName = "企标复审流程-工作组成员标准复审"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("23"); + 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/enterpriseBidReviewProcess/ProcessStep1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1Before.java new file mode 100644 index 00000000..bc4d023a --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep1Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.enterpriseBidReviewProcess; + +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 ProcessStep1Before implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2After.java new file mode 100644 index 00000000..51167d90 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2After.java @@ -0,0 +1,98 @@ +package com.ydw.bat.wkflow.listener.enterpriseBidReviewProcess; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.tmsps.fk.common.util.JsonUtil; +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 springfox.documentation.spring.web.json.Json; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class ProcessStep2After 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); + + //根据流程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); + + //标准法规部业务经理Id + List nextUserList = new ArrayList(); + if (null == delegateTask.getVariable("count")) { + delegateTask.setVariable("count", delegateTask.getVariable("workPeopleList", List.class).size()); + } + if (delegateTask.getVariable("count",Integer.class)==1){ + //合并前面数据中的意见 该部分需要在调试中进行编写 + List busProcessNews = busBean.findLastworkPeople2("企标复审流程",delegateTask.getProcessInstanceId()); + System.out.println(busProcessNews); + List strings=new ArrayList<>(); + strings.add(object.getString("presentPeople")+"-"+object.getString("nextStatus")); + for (BusProcessNew bus:busProcessNews) { + JSONObject object1=JSONObject.parseObject(bus.getMesg()); + strings.add(object1.getString("presentPeople")+"-"+object1.getString("nextStatus")); + } + System.out.println(JSONArray.toJSON(strings.toString())); + object.put("res", JSONArray.toJSON(strings.toString())); + delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)-1); + }else { + delegateTask.setVariable("count",delegateTask.getVariable("count",Integer.class)-1); + } + nextUserList.add(delegateTask.getVariable("wgLeaderId",String.class)); + delegateTask.setVariable("wgLeaderId1",delegateTask.getVariable("wgLeaderId",String.class)); + //截止时间 流程描述 创建人 + String user = delegateTask.getVariable("prcCreateUser",String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + String prcName = "企标复审流程"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("23"); + 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); + if (delegateTask.getVariable("count",Integer.class)!=0){ + busProcessNewNext.setTaskId("999"); + } + busBean.save(busProcessNewNext); + } + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2Before.java new file mode 100644 index 00000000..bc3d3c7c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep2Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.enterpriseBidReviewProcess; + +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 ProcessStep2Before implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3After.java new file mode 100644 index 00000000..34d112ef --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3After.java @@ -0,0 +1,118 @@ +package com.ydw.bat.wkflow.listener.enterpriseBidReviewProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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; + +public class ProcessStep3After 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); + + //根据流程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); + //标准法规部业务经理Id + List nextUserList = new ArrayList(); + //根据意见选择 企标状态并对企标信息进行修改 + if ("修订".equals(object.getString("nextStatus"))){ + + }else if ("废止".equals(object.getString("nextStatus"))){ + // TODO: 2021/11/16 等待超哥的修改企标状态的接口 + } + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + if(one2!=null){ + one2.setOverTime(OVERTIME); + one2.setPrcType("23"); + busProcessNameService.saveOrUpdate(one2); + } + + + // 存储当前节点意见1 + 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); + } + } + 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.setPrcName("企标复审流程-流程结束"); + busBean.save(busProcessNewNext); + + + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID",delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if(one1!=null){ + one1.setCommitFlag("0"); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + + + } + + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object,String commitFlag ,IBusProcessNameService busProcessNameService) { + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + if(one2!=null){ + one2.setOverTime(OVERTIME); + one2.setPrcType("23"); + busProcessNameService.saveOrUpdate(one2); + } + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID",delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if(one1!=null){ + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + one1.setPrcName("流程结束"); + busBean.saveOrUpdate(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3Before.java new file mode 100644 index 00000000..20540fed --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessStep3Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.enterpriseBidReviewProcess; + +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 ProcessStep3Before implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessstartAfter.java new file mode 100644 index 00000000..35737660 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessstartAfter.java @@ -0,0 +1,78 @@ +package com.ydw.bat.wkflow.listener.enterpriseBidReviewProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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; + +public class ProcessstartAfter 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); + + //根据流程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); + //标准法规部业务经理Id + List nextUserList = new ArrayList(); + nextUserList.add(object.getString("dockUser")); + delegateTask.setVariable("wgLeaderId",object.getString("dockUser")); + + + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("prcCreateUser", user); + delegateTask.setVariable("prcCreateUserName", username); + String prcName = "企标复审流程-工作组组长选择责任人"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("23"); + 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/enterpriseBidReviewProcess/ProcessstartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessstartBefore.java new file mode 100644 index 00000000..00e5bfcc --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseBidReviewProcess/ProcessstartBefore.java @@ -0,0 +1,13 @@ +package com.ydw.bat.wkflow.listener.enterpriseBidReviewProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class ProcessstartBefore implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java new file mode 100644 index 00000000..f2baf85b --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1After.java @@ -0,0 +1,89 @@ +package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class ProcessStep1After 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); + + //根据流程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); + //标准法规部业务经理Id + List nextUserList = new ArrayList(); + if ("0".equals(object.getString("passFlag"))) { + if (object.getString("deptCenterId").contains(",")) { + nextUserList = new ArrayList<>(Arrays.asList(object.getString("deptCenterId").split(","))); + } else { + nextUserList.add(object.getString("deptCenterId")); + } + delegateTask.setVariable("deptCenterId", nextUserList); + delegateTask.setVariable("deptLeaderFlag",0); + }else { + nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class)); + delegateTask.setVariable("createUser",delegateTask.getVariable("prcCreateUser",String.class)); + delegateTask.setVariable("deptLeaderFlag",1); + } + + //截止时间 流程描述 创建人 + String user = delegateTask.getVariable("prcCreateUser",String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + String prcName = ""; + if ("0".equals(object.getString("passFlag"))) { + prcName = "企标制修订计划-部门中心主任会签"; + }else { + prcName = "企标制修订计划-企标制修订计划整改"; + } + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("25"); + 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/enterpriseStandardSystemRevisionPlan/ProcessStep1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1Before.java new file mode 100644 index 00000000..7839c4c8 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep1Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan; + +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 ProcessStep1Before implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java new file mode 100644 index 00000000..c06a7ae6 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2After.java @@ -0,0 +1,92 @@ +package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.ArrayList; +import java.util.List; + +public class ProcessStep2After 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); + + //根据流程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); + //标准法规部业务经理Id + List nextUserList = new ArrayList(); + //计算最后的会签结果 使用的与运算啦啦啦啦 + String prcName =""; + if (null == delegateTask.getVariable("deptCenterFlag")) { + delegateTask.setVariable("deptCenterFlag", object.getInteger("deptCenterFlag")); + } else { + delegateTask.setVariable("deptCenterFlag", object.getInteger("deptCenterFlag") & delegateTask.getVariable("deptCenterFlag", Integer.class)); + } + + delegateTask.setVariable("bzfgLeaderId", object.getString("bzfgLeaderId")); + if (delegateTask.getVariable("count", Integer.class) == 1) { + //合并前面数据中的意见 该部分需要在调试中进行编写 + if ("0".equals(delegateTask.getVariable("deptCenterFlag"))){ + nextUserList.add(object.getString("bzfgLeaderId")); + prcName="企标制修订计划-标准法规工作组组长审定"; + }else { + nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class)); + delegateTask.setVariable("createUser",delegateTask.getVariable("prcCreateUser",String.class)); + prcName="企标制修订计划整改"; + } + } else { + delegateTask.setVariable("count", delegateTask.getVariable("count", Integer.class) - 1); + } + + + //截止时间 流程描述 创建人 + String user = delegateTask.getVariable("prcCreateUser", String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("25"); + 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/enterpriseStandardSystemRevisionPlan/ProcessStep2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2Before.java new file mode 100644 index 00000000..267433dc --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep2Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan; + +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 ProcessStep2Before implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java new file mode 100644 index 00000000..70a33b9a --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3After.java @@ -0,0 +1,82 @@ +package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.ArrayList; +import java.util.List; + +public class ProcessStep3After 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); + + //根据流程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); + //标准法规部业务经理Id + List nextUserList = new ArrayList(); + String prcName = ""; + //根据意见选择 企标状态并对企标信息进行修改 bzfgId + if ("0".equals(object.getString("bzFlag"))){ + prcName = "企标制修订计划-标准法规部部长审批"; + nextUserList.add(object.getString("bzfgId")); + delegateTask.setVariable("bzFlag",0); + delegateTask.setVariable("bzfgId",object.getString("bzfgId")); + }else { + prcName="企标制修订计划整改"; + delegateTask.setVariable("bzFlag",1); + nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class)); + delegateTask.setVariable("createUser",delegateTask.getVariable("prcCreateUser",String.class)); + } + + //截止时间 流程描述 创建人 + String user = delegateTask.getVariable("prcCreateUser",String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("25"); + 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/enterpriseStandardSystemRevisionPlan/ProcessStep3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3Before.java new file mode 100644 index 00000000..b6555197 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep3Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan; + +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 ProcessStep3Before implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java new file mode 100644 index 00000000..c991d2e9 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4After.java @@ -0,0 +1,90 @@ +package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.ArrayList; +import java.util.List; + +public class ProcessStep4After 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); + + //根据流程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); + //标准法规部业务经理Id + List nextUserList = new ArrayList(); + String prcName = ""; + //根据意见选择 企标状态并对企标信息进行修改 bzfgId + if ("0".equals(object.getString("bzfgbzFlag"))){ + prcName = "企标制修订计划-流程结束"; + delegateTask.setVariable("bzfgbzFlag",0); + }else { + prcName="企标制修订计划整改"; + delegateTask.setVariable("bzfgbzFlag",1); + nextUserList.add(delegateTask.getVariable("prcCreateUser",String.class)); + delegateTask.setVariable("createUser",delegateTask.getVariable("prcCreateUser",String.class)); + } + + //截止时间 流程描述 创建人 + String user = delegateTask.getVariable("prcCreateUser",String.class); + String username = delegateTask.getVariable("prcCreateUserName", String.class); + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("25"); + 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); + } + }else { + 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.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4Before.java new file mode 100644 index 00000000..e44bf789 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessStep4Before.java @@ -0,0 +1,36 @@ +package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan; + +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 ProcessStep4Before implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + 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("xmpg2Step11?prcType=6"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java new file mode 100644 index 00000000..cc1d0aa0 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartAfter.java @@ -0,0 +1,76 @@ +package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +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.util.ArrayList; +import java.util.List; + +public class ProcessstartAfter 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); + + //根据流程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); + //标准法规部业务经理Id deptCenterId + List nextUserList = new ArrayList(); + nextUserList.add(object.getString("dockUser")); + delegateTask.setVariable("topmanagerId",object.getString("dockUser")); + + + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("prcCreateUser", user); + delegateTask.setVariable("prcCreateUserName", username); + String prcName = "企标制修订计划-部门高级经理审批"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if (one1 != null) { + one1.setPrcType("25"); + 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/enterpriseStandardSystemRevisionPlan/ProcessstartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartBefore.java new file mode 100644 index 00000000..f16c7ddc --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/enterpriseStandardSystemRevisionPlan/ProcessstartBefore.java @@ -0,0 +1,13 @@ +package com.ydw.bat.wkflow.listener.enterpriseStandardSystemRevisionPlan; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class ProcessstartBefore implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + + } + +} diff --git a/src/main/resources/mapper/datas/BusProcessNewMapper.xml b/src/main/resources/mapper/datas/BusProcessNewMapper.xml index f2c9bf4e..ab75f860 100644 --- a/src/main/resources/mapper/datas/BusProcessNewMapper.xml +++ b/src/main/resources/mapper/datas/BusProcessNewMapper.xml @@ -34,6 +34,11 @@ WHERE bpn.P_ID = #{pId} and aht.TASK_DEF_KEY_ = #{key} + +