From 2a41b35d76caf8f82831daac298e7c720bba92c4 Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Wed, 27 Oct 2021 11:19:32 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8B---=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MinisterApprovalAfter.java | 2 ++ .../MinisterApprovalBefore.java | 23 +++++++++++++++++++ .../PRGAMStartAfter.java | 1 + .../PresidentApprovalAfter.java | 1 + .../PresidentApprovalBefore.java | 23 +++++++++++++++++++ .../RevisionInformationAfter.java | 14 ++--------- .../RevisionInformationBefore.java | 23 +++++++++++++++++++ 7 files changed, 75 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java index c0e9c3d0..5c929960 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java @@ -41,11 +41,13 @@ public class MinisterApprovalAfter implements TaskListener { if("1".equals(object.getString("fgfbz"))){ delegateTask.setVariable("fgfbz", "1"); if (StringUtils.isNotBlank(object.getString("presidentId"))){ + nextUserList.add(object.getString("presidentId")); delegateTask.setVariable("presidentApproval", object.getString("presidentId")); } }else if ("0".equals(object.getString("fgfbz"))){ delegateTask.setVariable("fgfbz", "0"); if (StringUtils.isNotBlank(object.getString("revisionId"))){ + nextUserList.add(object.getString("revisionId")); delegateTask.setVariable("revision", object.getString("revisionId")); } }else{ diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java index 3fdc0fa9..5ca46dbe 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java @@ -1,11 +1,34 @@ package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; +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 MinisterApprovalBefore 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("policyResearchGroupEnrollment2?prcType=18"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java index dce211d3..8bef4500 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java @@ -39,6 +39,7 @@ public class PRGAMStartAfter implements TaskListener { List nextUserList = new ArrayList(); if(StringUtils.isNotBlank(object.getString("ministerId"))){ delegateTask.setVariable("ministerApproval", object.getString("ministerId")); + nextUserList.add(object.getString("ministerId")); } //截止时间 流程描述 创建人 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java index 0a05ed9e..468bccf7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java @@ -42,6 +42,7 @@ public class PresidentApprovalAfter implements TaskListener { }else{ delegateTask.setVariable("gsfz", "0"); if (StringUtils.isNotBlank(object.getString("revisionId"))){ + nextUserList.add(object.getString("revisionId")); delegateTask.setVariable("revision", object.getString("revisionId")); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java index d49c05e3..1e194949 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java @@ -1,11 +1,34 @@ package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; +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 PresidentApprovalBefore 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("policyResearchGroupEnrollment2?prcType=18"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java index 217c0662..cbfc6831 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java @@ -39,6 +39,7 @@ public class RevisionInformationAfter implements TaskListener { List nextUserList = new ArrayList(); if (StringUtils.isNotBlank(object.getString("ministerId"))){ + nextUserList.add(object.getString("ministerId")); delegateTask.setVariable("ministerApproval", object.getString("ministerId")); } @@ -70,18 +71,7 @@ public class RevisionInformationAfter implements TaskListener { } // 存储当前节点意见 // 存储当前节点意见 - if (null!=object.getString("commentText")) { - QueryWrapper queryWrapper3 = new QueryWrapper(); - queryWrapper3.eq("TASK_ID", delegateTask.getId()); - queryWrapper3.eq("USER_ID",delegateTask.getAssignee()); - List list = busBean.list(queryWrapper3); - if(!list.isEmpty()){ - BusProcessNew busProcessNews = list.get(0); - busProcessNews.setTaskId(delegateTask.getId()); - busProcessNews.setCommitText(object.getString("commentText")); - busBean.saveOrUpdate(busProcessNews); - } - } + if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ BusProcessNew busProcessNewNext = new BusProcessNew(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java index 9c79a0ad..31f60396 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java @@ -1,11 +1,34 @@ package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; +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 RevisionInformationBefore 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("policyResearchGroupEnrollment2?prcType=18"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } } } From eb05c2f40de0dcc9492077aa8ad16de11201702a Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Wed, 27 Oct 2021 15:02:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84-prcName-=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApprovalAfter.java | 28 +++++++------ .../ApprovalBefore.java | 23 ++++++++++ .../InputInformationAfter.java | 2 + .../InputInformationBefore.java | 23 ++++++++++ .../PRGAMStartAfter.java | 8 +--- .../RevisionInformationAfter.java | 1 + .../RevisionInformationBefore.java | 23 ++++++++++ .../MinisterApprovalAfter.java | 42 ++++++++++--------- .../PRGAMStartAfter.java | 3 +- .../PresidentApprovalAfter.java | 30 ++++++++----- .../RevisionInformationAfter.java | 17 ++++---- .../PGREPresidentApprovalAfter.java | 22 +++++----- .../PRGEInspectorApprovalAfter.java | 22 +++++----- .../PRGEMinisterConfirmAfter.java | 23 +++++----- .../PRGEStartAfter.java | 2 +- .../RevisonInformationAfter.java | 2 +- 16 files changed, 181 insertions(+), 90 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java index 4c60d505..841f0e39 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java @@ -35,18 +35,6 @@ public class ApprovalAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - - List nextUserList = new ArrayList(); - - if("1".equals(object.getString("shyFlag"))){ - delegateTask.setVariable("shyFlag", "1"); - }else{ - delegateTask.setVariable("shyFlag", "0"); - if(StringUtils.isNotBlank(object.getString("revisionId"))){ - delegateTask.setVariable("revision", object.getString("revisionId")); - } - } - //截止时间 流程描述 创建人 // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); @@ -56,6 +44,22 @@ public class ApprovalAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName",standName); String prcName=""; + + List nextUserList = new ArrayList(); + + if("1".equals(object.getString("shyFlag"))){ + delegateTask.setVariable("shyFlag", "1"); + prcName = standName + "-政策课题组会后流程"; + }else{ + delegateTask.setVariable("shyFlag", "0"); + if(StringUtils.isNotBlank(object.getString("revisionId"))){ + delegateTask.setVariable("revision", object.getString("revisionId")); + nextUserList.add(object.getString("revisionId")); + prcName = standName + "-政策课题组会后流程-申请人修订申请信息"; + } + } + + // if(object.getString("signFlag").equals("1")) { // prcName = standName + "-标准法规清单申请-会签"; // }else { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java index 198cd5e2..d706b8eb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java @@ -1,11 +1,34 @@ package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; +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 ApprovalBefore 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("policyResearchGroupEnrollment2?prcType=19"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java index dc24f48a..6ffc001b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java @@ -39,6 +39,7 @@ public class InputInformationAfter implements TaskListener { List nextUserList = new ArrayList(); if(StringUtils.isNotBlank(object.getString("approvalId"))){ delegateTask.setVariable("approval", object.getString("approvalId")); + nextUserList.add(object.getString("approvalId")); } //截止时间 流程描述 创建人 @@ -50,6 +51,7 @@ public class InputInformationAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName",standName); String prcName=""; + prcName = standName + "-政策课题组会后流程-审核员批准"; // if(object.getString("signFlag").equals("1")) { // prcName = standName + "-标准法规清单申请-会签"; // }else { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java index bcb3db24..b81e8f66 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java @@ -1,11 +1,34 @@ package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; +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 InputInformationBefore 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("policyResearchGroupEnrollment2?prcType=19"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java index e3b34cda..2f3cdb66 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java @@ -39,6 +39,7 @@ public class PRGAMStartAfter implements TaskListener { List nextUserList = new ArrayList(); if(StringUtils.isNotBlank(object.getString("applicantId"))){ delegateTask.setVariable("inputInformation", object.getString("applicantId")); + nextUserList.add(object.getString("applicantId")); } //截止时间 流程描述 创建人 @@ -49,12 +50,7 @@ public class PRGAMStartAfter implements TaskListener { delegateTask.setVariable("createUserName",username); String standName = object.getString("listName"); delegateTask.setVariable("listName",standName); - String prcName=""; -// if(object.getString("signFlag").equals("1")) { -// prcName = standName + "-标准法规清单申请-会签"; -// }else { -// prcName = standName + "-标准法规清单申请-经理审批"; -// } + String prcName=standName + "-政策课题组会后流程-申请人填写表单"; QueryWrapper queryWrapper2 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java index e736e191..a0e5e9ca 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java @@ -39,6 +39,7 @@ public class RevisionInformationAfter implements TaskListener { List nextUserList = new ArrayList(); if(StringUtils.isNotBlank(object.getString("approvalId"))){ delegateTask.setVariable("approval", object.getString("approvalId")); + nextUserList.add(object.getString("approvalId")); } //截止时间 流程描述 创建人 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java index 22b82c13..47d49dc4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java @@ -1,11 +1,34 @@ package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; +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 RevisionInformationBefore 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("policyResearchGroupEnrollment2?prcType=19"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java index 5c929960..6f3447e4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java @@ -35,25 +35,6 @@ public class MinisterApprovalAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - - List nextUserList = new ArrayList(); - - if("1".equals(object.getString("fgfbz"))){ - delegateTask.setVariable("fgfbz", "1"); - if (StringUtils.isNotBlank(object.getString("presidentId"))){ - nextUserList.add(object.getString("presidentId")); - delegateTask.setVariable("presidentApproval", object.getString("presidentId")); - } - }else if ("0".equals(object.getString("fgfbz"))){ - delegateTask.setVariable("fgfbz", "0"); - if (StringUtils.isNotBlank(object.getString("revisionId"))){ - nextUserList.add(object.getString("revisionId")); - delegateTask.setVariable("revision", object.getString("revisionId")); - } - }else{ - delegateTask.setVariable("fgfbz", "2"); - } - //截止时间 流程描述 创建人 // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); @@ -63,6 +44,29 @@ public class MinisterApprovalAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName",standName); String prcName=""; + + List nextUserList = new ArrayList(); + + if("1".equals(object.getString("fgfbz"))){ + delegateTask.setVariable("fgfbz", "1"); + if (StringUtils.isNotBlank(object.getString("presidentId"))){ + nextUserList.add(object.getString("presidentId")); + delegateTask.setVariable("presidentApproval", object.getString("presidentId")); + prcName = standName + "-政策课题组参会流程-公司副总批准"; + } + }else if ("0".equals(object.getString("fgfbz"))){ + delegateTask.setVariable("fgfbz", "0"); + if (StringUtils.isNotBlank(object.getString("revisionId"))){ + nextUserList.add(object.getString("revisionId")); + delegateTask.setVariable("revision", object.getString("revisionId")); + prcName = standName + "-政策课题组参会流程-修订参会信息"; + } + }else{ + delegateTask.setVariable("fgfbz", "2"); + prcName = standName + "-政策课题组参会流程"; + } + + // if(object.getString("signFlag").equals("1")) { // prcName = standName + "-标准法规清单申请-会签"; // }else { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java index 8bef4500..699b9939 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java @@ -50,7 +50,8 @@ public class PRGAMStartAfter implements TaskListener { delegateTask.setVariable("createUserName",username); String standName = object.getString("listName"); delegateTask.setVariable("listName",standName); - String prcName=""; + String prcName = ""; + prcName= standName + "-政策课题组参会流程-法规认证部副部长审核"; // if(object.getString("signFlag").equals("1")) { // prcName = standName + "-标准法规清单申请-会签"; // }else { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java index 468bccf7..0a2de37c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java @@ -36,17 +36,6 @@ public class PresidentApprovalAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); - if("1".equals(object.getString("gsfz"))){ - delegateTask.setVariable("gsfz", "1"); - }else{ - delegateTask.setVariable("gsfz", "0"); - if (StringUtils.isNotBlank(object.getString("revisionId"))){ - nextUserList.add(object.getString("revisionId")); - delegateTask.setVariable("revision", object.getString("revisionId")); - } - } - //截止时间 流程描述 创建人 // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); @@ -56,6 +45,25 @@ public class PresidentApprovalAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName",standName); String prcName=""; + List nextUserList = new ArrayList(); + + + if("1".equals(object.getString("gsfz"))){ + delegateTask.setVariable("gsfz", "1"); + prcName = standName + "-政策课题组参会流程"; + }else{ + delegateTask.setVariable("gsfz", "0"); + if (StringUtils.isNotBlank(object.getString("revisionId"))){ + nextUserList.add(object.getString("revisionId")); + delegateTask.setVariable("revision", object.getString("revisionId")); + prcName = standName + "-政策课题组参会流程-修订参会信息"; + } + } + + + + + QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java index cbfc6831..1fdc43b8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java @@ -35,14 +35,6 @@ public class RevisionInformationAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - - List nextUserList = new ArrayList(); - - if (StringUtils.isNotBlank(object.getString("ministerId"))){ - nextUserList.add(object.getString("ministerId")); - delegateTask.setVariable("ministerApproval", object.getString("ministerId")); - } - //截止时间 流程描述 创建人 // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("prcCreateUser"); @@ -52,6 +44,15 @@ public class RevisionInformationAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName",standName); String prcName=""; + List nextUserList = new ArrayList(); + + if (StringUtils.isNotBlank(object.getString("ministerId"))){ + nextUserList.add(object.getString("ministerId")); + delegateTask.setVariable("ministerApproval", object.getString("ministerId")); + prcName = standName + "-政策课题组参会流程-法规认证部副部长审核"; + } + + // if(object.getString("signFlag").equals("1")) { // prcName = standName + "-标准法规清单申请-会签"; // }else { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java index 6f61ba6c..3d0fd47c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java @@ -41,17 +41,28 @@ public class PGREPresidentApprovalAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); + 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=standName; + List nextUserList = new ArrayList(); if ("1".equals(object.getString("gsfz"))) { delegateTask.setVariable("gsfz", "1"); + prcName += "-政策课题组入会流程"; } else { delegateTask.setVariable("gsfz", "0"); if (StringUtils.isNotBlank(object.getString("revisionId"))) { delegateTask.setVariable("revisionInformation", object.getString("revisionId")); nextUserList.add(object.getString("revisionId")); } + prcName += "-政策课题组入会流程-修订入会信息"; } // 存储当前节点意见 if (null != object.getString("commentText")) { @@ -68,17 +79,6 @@ public class PGREPresidentApprovalAfter 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=""; - prcName = standName + "-政策课题组入会流程-"; - 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/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java index d9628c82..92d4a779 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java @@ -42,6 +42,14 @@ public class PRGEInspectorApprovalAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); + 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=""; List nextUserList = new ArrayList(); if ("1".equals(object.getString("fgfzj"))) { @@ -50,14 +58,17 @@ public class PRGEInspectorApprovalAfter implements TaskListener { delegateTask.setVariable("presidentApproval", object.getString("presidentId")); nextUserList.add(object.getString("presidentId")); } + prcName = standName + "-政策课题组入会流程-公司副总批准"; } else if ("0".equals(object.getString("fgfzj"))) { delegateTask.setVariable("fgfzj", "0"); if (StringUtils.isNotBlank(object.getString("revisionId"))){ delegateTask.setVariable("revisionInformation", object.getString("revisionId")); - + nextUserList.add(object.getString("revisionId")); } + prcName = standName + "-政策课题组入会流程-修订入会信息"; }else{ delegateTask.setVariable("fgfzj", "2"); + prcName = standName + "-政策课题组入会流程"; } // 存储当前节点意见 @@ -76,15 +87,6 @@ public class PRGEInspectorApprovalAfter 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=""; - prcName = standName + "-标准化活动入会流程-"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java index 78e56a7c..8287679c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java @@ -42,6 +42,16 @@ public class PRGEMinisterConfirmAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); + //截止时间 流程描述 创建人 + 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=""; + List nextUserList = new ArrayList(); @@ -52,12 +62,14 @@ public class PRGEMinisterConfirmAfter implements TaskListener { delegateTask.setVariable("inspectorApproval", object.getString("inspectorId")); nextUserList.add(object.getString("inspectorId")); } + prcName = standName + "-政策课题组入会流程-法规认证部副总监批准"; }else{ delegateTask.setVariable("fgfbz","0"); if (StringUtils.isNotBlank(object.getString("revisionId"))){ delegateTask.setVariable("revisionInformation", object.getString("revisionId")); nextUserList.add(object.getString("revisionId")); } + prcName = standName + "-政策课题组入会流程-修订入会信息"; } // 存储当前节点意见 @@ -78,16 +90,7 @@ public class PRGEMinisterConfirmAfter 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=""; - prcName = standName + "-标准化活动入会流程-副总监批准"; + QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java index b4fbeece..5d515efe 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java @@ -60,7 +60,7 @@ public class PRGEStartAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName",standName); String prcName=""; - prcName = standName + "-标准化活动入会流程-副部长审核"; + prcName = standName + "-标准化活动入会流程-法规认证部副部长审核"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java index abc0a966..606191b2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java @@ -58,7 +58,7 @@ public class RevisonInformationAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName",standName); String prcName=""; - prcName = standName + "-政策课题组入会流程-"; + prcName = standName + "-政策课题组入会流程-法规认证部副部长审核"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); From cd93e51a8ee375cb52ca68a9f8b60ad2dba6ce21 Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Wed, 27 Oct 2021 15:47:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84-=E4=BB=A3=E7=A0=81=E4=BF=AE=E6=94=B9-1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApprovalAfter.java | 12 ++++-------- .../InputInformationAfter.java | 16 +++++++++------- .../PRGAMStartAfter.java | 8 +++----- .../RevisionInformationAfter.java | 10 +++------- .../MinisterApprovalAfter.java | 18 +++++++++--------- .../PRGAMStartAfter.java | 10 ++++------ .../PresidentApprovalAfter.java | 14 ++++++-------- .../RevisionInformationAfter.java | 16 +++++++++------- .../PGREPresidentApprovalAfter.java | 16 ++++++---------- .../PRGEInspectorApprovalAfter.java | 15 +++++---------- .../PRGEMinisterConfirmAfter.java | 13 ++++--------- .../PRGEStartAfter.java | 4 +--- .../RevisonInformationAfter.java | 11 +++-------- 13 files changed, 66 insertions(+), 97 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java index 841f0e39..f914b11f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java @@ -37,25 +37,21 @@ public class ApprovalAfter implements TaskListener { delegateTask.setVariable("objectJson",object); //截止时间 流程描述 创建人 // 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 user = delegateTask.getVariable("createUser", String.class); + String username = delegateTask.getVariable("createUserName", String.class); String prcName=""; List nextUserList = new ArrayList(); if("1".equals(object.getString("shyFlag"))){ delegateTask.setVariable("shyFlag", "1"); - prcName = standName + "-政策课题组会后流程"; + prcName = "政策课题组会后流程"; }else{ delegateTask.setVariable("shyFlag", "0"); if(StringUtils.isNotBlank(object.getString("revisionId"))){ delegateTask.setVariable("revision", object.getString("revisionId")); nextUserList.add(object.getString("revisionId")); - prcName = standName + "-政策课题组会后流程-申请人修订申请信息"; + prcName = "政策课题组会后流程-申请人修订申请信息"; } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java index 6ffc001b..de6b391e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java @@ -44,14 +44,16 @@ public class InputInformationAfter 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 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 user = delegateTask.getVariable("createUser", String.class); + String username = delegateTask.getVariable("createUserName", String.class); String prcName=""; - prcName = standName + "-政策课题组会后流程-审核员批准"; + prcName = "政策课题组会后流程-审核员批准"; // if(object.getString("signFlag").equals("1")) { // prcName = standName + "-标准法规清单申请-会签"; // }else { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java index 2f3cdb66..f1c7a6a7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java @@ -44,13 +44,11 @@ public class PRGAMStartAfter implements TaskListener { //截止时间 流程描述 创建人 // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); + String user = object.getString("revisionId"); delegateTask.setVariable("createUser",user); - String username = object.getString("prcCreateUserName"); + String username = object.getString("revisionIdName"); delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); - String prcName=standName + "-政策课题组会后流程-申请人填写表单"; + String prcName= "政策课题组会后流程-申请人填写表单"; QueryWrapper queryWrapper2 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java index a0e5e9ca..4a0bbcd3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java @@ -44,13 +44,9 @@ public class RevisionInformationAfter 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=""; + String user = delegateTask.getVariable("createUser",String.class); + String username = delegateTask.getVariable("createUserName",String.class); + String prcName="政策课题组会后流程-审核员审核"; // if(object.getString("signFlag").equals("1")) { // prcName = standName + "-标准法规清单申请-会签"; // }else { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java index 6f3447e4..82f2599a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java @@ -37,12 +37,12 @@ public class MinisterApprovalAfter implements TaskListener { delegateTask.setVariable("objectJson",object); //截止时间 流程描述 创建人 // 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 user = object.getString("prcCreateUser"); +// delegateTask.setVariable("createUser",user); +// String username = object.getString("prcCreateUserName"); +// delegateTask.setVariable("createUserName",username); + String user = delegateTask.getVariable("createUser",String.class); + String username = delegateTask.getVariable("createUserName",String.class); String prcName=""; List nextUserList = new ArrayList(); @@ -52,18 +52,18 @@ public class MinisterApprovalAfter implements TaskListener { if (StringUtils.isNotBlank(object.getString("presidentId"))){ nextUserList.add(object.getString("presidentId")); delegateTask.setVariable("presidentApproval", object.getString("presidentId")); - prcName = standName + "-政策课题组参会流程-公司副总批准"; + prcName = "政策课题组参会流程-公司副总批准"; } }else if ("0".equals(object.getString("fgfbz"))){ delegateTask.setVariable("fgfbz", "0"); if (StringUtils.isNotBlank(object.getString("revisionId"))){ nextUserList.add(object.getString("revisionId")); delegateTask.setVariable("revision", object.getString("revisionId")); - prcName = standName + "-政策课题组参会流程-修订参会信息"; + prcName = "政策课题组参会流程-修订参会信息"; } }else{ delegateTask.setVariable("fgfbz", "2"); - prcName = standName + "-政策课题组参会流程"; + prcName = "政策课题组参会流程"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java index 699b9939..a96ecdf3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java @@ -44,18 +44,16 @@ public class PRGAMStartAfter implements TaskListener { //截止时间 流程描述 创建人 // String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); + String user = object.getString("revisionId"); delegateTask.setVariable("createUser",user); - String username = object.getString("prcCreateUserName"); + String username = object.getString("revisionIdName"); delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); String prcName = ""; - prcName= standName + "-政策课题组参会流程-法规认证部副部长审核"; + prcName= "政策课题组参会流程-法规认证部副部长审核"; // if(object.getString("signFlag").equals("1")) { // prcName = standName + "-标准法规清单申请-会签"; // }else { -// prcName = standName + "-标准法规清单申请-经理审批"; +// prcName = standName + "标准法规清单申请-经理审批"; // } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java index 0a2de37c..75960693 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java @@ -38,25 +38,23 @@ public class PresidentApprovalAfter 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 user = object.getString("prcCreateUser"); +// delegateTask.setVariable("createUser",user); + String user = delegateTask.getVariable("createUser",String.class); + String username = delegateTask.getVariable("createUserName",String.class); String prcName=""; List nextUserList = new ArrayList(); if("1".equals(object.getString("gsfz"))){ delegateTask.setVariable("gsfz", "1"); - prcName = standName + "-政策课题组参会流程"; + prcName = "政策课题组参会流程"; }else{ delegateTask.setVariable("gsfz", "0"); if (StringUtils.isNotBlank(object.getString("revisionId"))){ nextUserList.add(object.getString("revisionId")); delegateTask.setVariable("revision", object.getString("revisionId")); - prcName = standName + "-政策课题组参会流程-修订参会信息"; + prcName = "政策课题组参会流程-修订参会信息"; } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java index 1fdc43b8..5ae077f5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java @@ -37,19 +37,21 @@ public class RevisionInformationAfter implements TaskListener { delegateTask.setVariable("objectJson",object); //截止时间 流程描述 创建人 // 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 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 user = delegateTask.getVariable("createUser",String.class); + String username = delegateTask.getVariable("createUserName",String.class); String prcName=""; List nextUserList = new ArrayList(); if (StringUtils.isNotBlank(object.getString("ministerId"))){ nextUserList.add(object.getString("ministerId")); delegateTask.setVariable("ministerApproval", object.getString("ministerId")); - prcName = standName + "-政策课题组参会流程-法规认证部副部长审核"; + prcName = "政策课题组参会流程-法规认证部副部长审核"; } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java index 3d0fd47c..dcf8ac40 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java @@ -41,28 +41,24 @@ public class PGREPresidentApprovalAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - 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=standName; + String user = delegateTask.getVariable("createUser", String.class); + String username = delegateTask.getVariable("createUserName", String.class); + String prcName=""; + List nextUserList = new ArrayList(); if ("1".equals(object.getString("gsfz"))) { delegateTask.setVariable("gsfz", "1"); - prcName += "-政策课题组入会流程"; + prcName = "政策课题组入会流程"; } else { delegateTask.setVariable("gsfz", "0"); if (StringUtils.isNotBlank(object.getString("revisionId"))) { delegateTask.setVariable("revisionInformation", object.getString("revisionId")); nextUserList.add(object.getString("revisionId")); } - prcName += "-政策课题组入会流程-修订入会信息"; + prcName = "政策课题组入会流程-修订入会信息"; } // 存储当前节点意见 if (null != object.getString("commentText")) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java index 92d4a779..730f633f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java @@ -42,13 +42,8 @@ public class PRGEInspectorApprovalAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - 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 user = delegateTask.getVariable("createUser", String.class); + String username = delegateTask.getVariable("createUserName", String.class); String prcName=""; List nextUserList = new ArrayList(); @@ -58,17 +53,17 @@ public class PRGEInspectorApprovalAfter implements TaskListener { delegateTask.setVariable("presidentApproval", object.getString("presidentId")); nextUserList.add(object.getString("presidentId")); } - prcName = standName + "-政策课题组入会流程-公司副总批准"; + prcName = "政策课题组入会流程-公司副总批准"; } else if ("0".equals(object.getString("fgfzj"))) { delegateTask.setVariable("fgfzj", "0"); if (StringUtils.isNotBlank(object.getString("revisionId"))){ delegateTask.setVariable("revisionInformation", object.getString("revisionId")); nextUserList.add(object.getString("revisionId")); } - prcName = standName + "-政策课题组入会流程-修订入会信息"; + prcName = "政策课题组入会流程-修订入会信息"; }else{ delegateTask.setVariable("fgfzj", "2"); - prcName = standName + "-政策课题组入会流程"; + prcName = "政策课题组入会流程"; } // 存储当前节点意见 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java index 8287679c..ad64a474 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java @@ -43,13 +43,8 @@ public class PRGEMinisterConfirmAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); //截止时间 流程描述 创建人 - 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 user = delegateTask.getVariable("createUser",String.class); + String username = delegateTask.getVariable("createUserName",String.class); String prcName=""; @@ -62,14 +57,14 @@ public class PRGEMinisterConfirmAfter implements TaskListener { delegateTask.setVariable("inspectorApproval", object.getString("inspectorId")); nextUserList.add(object.getString("inspectorId")); } - prcName = standName + "-政策课题组入会流程-法规认证部副总监批准"; + prcName = "政策课题组入会流程-法规认证部副总监批准"; }else{ delegateTask.setVariable("fgfbz","0"); if (StringUtils.isNotBlank(object.getString("revisionId"))){ delegateTask.setVariable("revisionInformation", object.getString("revisionId")); nextUserList.add(object.getString("revisionId")); } - prcName = standName + "-政策课题组入会流程-修订入会信息"; + prcName = "政策课题组入会流程-修订入会信息"; } // 存储当前节点意见 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java index 5d515efe..b09a0ffa 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java @@ -57,10 +57,8 @@ public class PRGEStartAfter implements TaskListener { delegateTask.setVariable("createUser",user); String username = object.getString("revisionIdName"); delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); String prcName=""; - prcName = standName + "-标准化活动入会流程-法规认证部副部长审核"; + prcName = "标准化活动入会流程-法规认证部副部长审核"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java index 606191b2..7b43394c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java @@ -50,15 +50,10 @@ public class RevisonInformationAfter implements TaskListener { // delegateTask.setVariable("ministerConfirm", object.getString("ministerId")); } - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("prcCreateUser"); - delegateTask.setVariable("createUser",user); - String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("createUserName",username); - String standName = object.getString("listName"); - delegateTask.setVariable("listName",standName); + String user = delegateTask.getVariable("createUser", String.class); + String username = delegateTask.getVariable("createUserName", String.class); String prcName=""; - prcName = standName + "-政策课题组入会流程-法规认证部副部长审核"; + prcName = "政策课题组入会流程-法规认证部副部长审核"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); From fe4913a9c176b75fd28748c8963a6e466c47f0ea Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Wed, 27 Oct 2021 17:48:22 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JoinStandardFiling/JSFApproveAfter.java | 2 +- .../JoinStandardFiling/JSFApproveBefore.java | 2 +- .../JoinStandardFiling/JSFAuditAfter.java | 17 ++-- .../JoinStandardFiling/JSFAuditBefore.java | 2 +- .../JSFFillinformationAfter.java | 5 +- .../JSFFillinformationBefore.java | 2 +- .../JoinStandardFiling/JSFIssuedAfter.java | 78 ------------------ .../JoinStandardFiling/JSFIssuedBefore.java | 34 -------- .../JoinStandardFiling/JSFstartAfter.java | 7 +- .../PRFApproveBefore.java | 2 +- .../PRFEngineerreviewBefore.java | 2 +- .../PRFFillinformationBefore.java | 2 +- .../PRFIssuedAfter.java | 79 ------------------- .../PRFIssuedBefore.java | 34 -------- .../PRFReviewdockBefore.java | 2 +- .../PRFUnderengineerBefore.java | 2 +- 16 files changed, 20 insertions(+), 252 deletions(-) delete mode 100644 src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedAfter.java delete mode 100644 src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedBefore.java delete mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFIssuedAfter.java delete mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFIssuedBefore.java 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 0a272fba..22f14184 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,7 +36,7 @@ public class JSFApproveAfter 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("Standardizer2", object.getString("Standardizer2User")); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveBefore.java index 7d29b130..d06ce9e4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveBefore.java @@ -26,7 +26,7 @@ public class JSFApproveBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bzqdfbStep5?prcType=15"); + one1.setLink("bzqdfbStep4?prcType=15"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } 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 62ceb391..f612e18d 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 @@ -35,13 +35,6 @@ public class JSFAuditAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值 - delegateTask.setVariable("statuteminister", object.getString("statuteministerUser")); - nextUserList.add(object.getString("statuteministerUser")); - delegateTask.setVariable("Standardizer2", object.getString("Standardizer2User")); - nextUserList.add(object.getString("Standardizer2User")); - -// 逻辑判断是否会签 signFlag if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("gcsFlag", 1); @@ -55,9 +48,9 @@ public class JSFAuditAfter implements TaskListener { } } else { delegateTask.setVariable("gcsFlag", 2); - if (StringUtils.isNotBlank(object.getString("Standardizer2User"))) { - delegateTask.setVariable("Standardizer2", object.getString("Standardizer2User")); - nextUserList.add(object.getString("Standardizer2User")); + if (StringUtils.isNotBlank(object.getString("dockUser"))) { + delegateTask.setVariable("Standardizer2", object.getString("dockUser")); + nextUserList.add(object.getString("dockUser")); } } @@ -70,9 +63,9 @@ public class JSFAuditAfter implements TaskListener { 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/JoinStandardFiling/JSFAuditBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditBefore.java index 43f2cc14..5611e898 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditBefore.java @@ -26,7 +26,7 @@ public class JSFAuditBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bzqdfbStep4?prcType=15"); + one1.setLink("bzqdfbStep3?prcType=15"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } 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 947ebfad..8351933c 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,10 +41,9 @@ public class JSFFillinformationAfter 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("dlFlag") == null ? "" : object.get("dlFlag").toString(); if ("1".equalsIgnoreCase(approvalOpinion)) { - delegateTask.setVariable("statuteengineer", object.getString("statuteengineerUser")); BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); @@ -53,7 +52,7 @@ public class JSFFillinformationAfter implements TaskListener { busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("statuteengineerUser")); + busProcessNew.setUserId(object.getString("passUser")); busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); busBean.save(busProcessNew); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationBefore.java index 29b80451..7bf8580a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationBefore.java @@ -26,7 +26,7 @@ public class JSFFillinformationBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bzqdfbStep3?prcType=15"); + one1.setLink("bzqdfbStep2?prcType=15"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedAfter.java deleted file mode 100644 index 0061a8b3..00000000 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedAfter.java +++ /dev/null @@ -1,78 +0,0 @@ -package com.ydw.bat.wkflow.listener.JoinStandardFiling; - -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 JSFIssuedAfter 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); - - 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(); - // 配置多实例 - delegateTask.setVariable("Standardizer2list",nextUserList); - -// 赋值署名领导 - delegateTask.setVariable("Standardizer2", object.getString("sonUser")); - nextUserList.add(object.getString("sonUser")); - - - //截止时间 流程描述 创建人 - 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) + "-加入标准化协会信息备案-填写入会信息"; - QueryWrapper queryWrapper2 = new QueryWrapper(); - queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); - BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); - - if (one1 != null) { - one1.setPrcType("15"); - 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); - } - } - } -} \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedBefore.java deleted file mode 100644 index 419c3b9b..00000000 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedBefore.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.ydw.bat.wkflow.listener.JoinStandardFiling; - -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 JSFIssuedBefore 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("bzqdfbStep2?prcType=15"); - one1.setTaskInfo(delegateTask.getName()); - oaService.sendTodoMq(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 e09f3f74..04625532 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 @@ -40,16 +40,17 @@ public class JSFstartAfter implements TaskListener { }else { nextUserList.add(ids); } -// 配置多实例 - delegateTask.setVariable("Standardizer1list",nextUserList); + // 配置多实例 + delegateTask.setVariable("Standardizer2list",nextUserList); + delegateTask.setVariable("Standardizer2", object.getString("dockUser")); //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); delegateTask.setVariable("prcCreateUser", user); delegateTask.setVariable("prcCreateUserName", username); - String prcName = "加入标准化协会信息备案-备案任务发起"; + String prcName = "加入标准化协会信息备案-填写入会信息"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java index 2b7a419c..decdcb09 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java @@ -26,7 +26,7 @@ public class PRFApproveBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bzqdfbStep7?prcType=14"); + one1.setLink("bzqdfbStep6?prcType=14"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java index 2729657f..34b4f18d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java @@ -26,7 +26,7 @@ public class PRFEngineerreviewBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bzqdfbStep6?prcType=14"); + one1.setLink("bzqdfbStep5?prcType=14"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java index 83267bbc..ad34f0ff 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java @@ -26,7 +26,7 @@ public class PRFFillinformationBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bzqdfbStep4?prcType=14"); + one1.setLink("bzqdfbStep3?prcType=14"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFIssuedAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFIssuedAfter.java deleted file mode 100644 index 97109bbf..00000000 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFIssuedAfter.java +++ /dev/null @@ -1,79 +0,0 @@ -package com.ydw.bat.wkflow.listener.ParticipateRevisionFiling; - -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 PRFIssuedAfter 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); - - 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(); -// 配置多实例 - delegateTask.setVariable("Buttpeople1list",nextUserList); - -// 赋值 - delegateTask.setVariable("Buttpeople1", object.getString("Buttpeople1User")); - nextUserList.add(object.getString("Buttpeople1User")); - - - //截止时间 流程描述 创建人 - 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) + "-参与外部标准制修订备案-下发工程师"; - 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/PRFIssuedBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFIssuedBefore.java deleted file mode 100644 index 6fff1914..00000000 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFIssuedBefore.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.ydw.bat.wkflow.listener.ParticipateRevisionFiling; - -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 PRFIssuedBefore 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("bzqdfbStep2?prcType=14"); - one1.setTaskInfo(delegateTask.getName()); - oaService.sendTodoMq(one1); - } - } -} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java index a09295ce..24f116c8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java @@ -26,7 +26,7 @@ public class PRFReviewdockBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bzqdfbStep5?prcType=14"); + one1.setLink("bzqdfbStep4?prcType=14"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java index e1ca29f5..3f9e7fed 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java @@ -26,7 +26,7 @@ public class PRFUnderengineerBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bzqdfbStep3?prcType=14"); + one1.setLink("bzqdfbStep2?prcType=14"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); }