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..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 @@ -30,21 +30,19 @@ 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); + delegateTask.setVariable("member", object.getString("member")); } @@ -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..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 @@ -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); + delegateTask.setVariable("member", object.getString("member")); } } + // 存储当前节点意见 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..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 @@ -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); + delegateTask.setVariable("director", object.getString("director")); } - //截止时间 流程描述 创建人 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");