From 99c31d89b0bff265e1181897a341ff42e88060ad Mon Sep 17 00:00:00 2001 From: Kevin Date: Fri, 29 Oct 2021 14:23:11 +0800 Subject: [PATCH] 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");