From dd52ea79a91194d39bef8ea37425c9496740d16b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 29 Oct 2021 14:06:49 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98=E7=BB=84?= =?UTF-8?q?=E5=85=A5=E4=BC=9A=20&=20=E5=8F=82=E4=BC=9A=20&=20=E4=BC=9A?= =?UTF-8?q?=E5=90=8E=20=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/TodoTaskController.java | 13 +++++++-- .../ApprovalAfter.java | 19 ++++++------- .../ApprovalBefore.java | 2 +- .../InputInformationAfter.java | 27 +------------------ .../InputInformationBefore.java | 2 +- .../PRGAMStartAfter.java | 17 +++++++----- .../RevisionInformationAfter.java | 18 ------------- .../RevisionInformationBefore.java | 2 +- .../MinisterApprovalAfter.java | 25 ----------------- .../MinisterApprovalBefore.java | 2 +- .../PRGAMStartAfter.java | 18 ------------- .../PresidentApprovalAfter.java | 20 +++++--------- .../PresidentApprovalBefore.java | 2 +- .../RevisionInformationAfter.java | 25 ----------------- .../RevisionInformationBefore.java | 2 +- .../PGREPresidentApprovalBefore.java | 2 +- .../PRGEInspectorApprovalBefore.java | 2 +- .../PRGEMinisterConfirmBefore.java | 2 +- .../PRGEStartAfter.java | 3 +-- .../RevisionInformationBefore.java | 2 +- .../mapper/datas/BusProcessNewMapper.xml | 21 ++++++++------- 21 files changed, 60 insertions(+), 166 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java index 58b51664..c7e9e76f 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TodoTaskController.java @@ -1964,7 +1964,12 @@ public class TodoTaskController extends BaseAction { queryWrapper1.eq("P_ID",busProcessName.getPrcId()); queryWrapper1.eq("TASK_ID",task.getId()); BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1); - busProcessName.setPrcName(busProcessNew.getPrcName()); + if (null!=busProcessNew.getPrcName()){ + busProcessName.setPrcName(busProcessNew.getPrcName()); + }else { + busProcessNew.setPrcName(""); + } + } } if (assignee != null && !assignee.equals("")) { @@ -2080,7 +2085,11 @@ public class TodoTaskController extends BaseAction { queryWrapper1.eq("P_ID",busProcessName.getPrcId()); queryWrapper1.eq("TASK_ID",task.getId()); BusProcessNew busProcessNew=iBusProcessNewService.getOne(queryWrapper1); - busProcessName.setPrcName(busProcessNew.getPrcName()); + if (null!=busProcessNew.getPrcName()){ + busProcessName.setPrcName(busProcessNew.getPrcName()); + }else { + busProcessNew.setPrcName(""); + } } } if (assignee != null && !assignee.equals("")) { 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 f914b11f..eae189eb 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 @@ -14,7 +14,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; public class ApprovalAfter implements TaskListener { @@ -26,7 +28,6 @@ public class ApprovalAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -36,7 +37,7 @@ public class ApprovalAfter 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 = delegateTask.getVariable("createUser", String.class); String username = delegateTask.getVariable("createUserName", String.class); String prcName=""; @@ -56,17 +57,14 @@ public class ApprovalAfter implements TaskListener { } -// if(object.getString("signFlag").equals("1")) { -// prcName = standName + "-标准法规清单申请-会签"; -// }else { -// prcName = standName + "-标准法规清单申请-经理审批"; -// } - - + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ + if("1".equals(object.getString("shyFlag"))){ + one1.setOverTime(OVERTIME); + } one1.setPrcType("19"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -74,7 +72,6 @@ public class ApprovalAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - // 存储当前节点意见 if (null!=object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -106,7 +103,7 @@ public class ApprovalAfter implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("业务经理审批"); + busProcessNewNext.setTaskInfo("政策课题组会后流程-结束"); busProcessNewNext.setUserId(object.getString("jlUserId")); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); 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 d706b8eb..5c0d829f 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 @@ -26,7 +26,7 @@ public class ApprovalBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment2?prcType=19"); + one1.setLink("zchhStep3?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 de6b391e..b43429a2 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 @@ -26,7 +26,6 @@ public class InputInformationAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -43,22 +42,9 @@ 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 = delegateTask.getVariable("createUser", String.class); String username = delegateTask.getVariable("createUserName", String.class); - String prcName=""; - prcName = "政策课题组会后流程-审核员批准"; -// if(object.getString("signFlag").equals("1")) { -// prcName = standName + "-标准法规清单申请-会签"; -// }else { -// prcName = standName + "-标准法规清单申请-经理审批"; -// } + String prcName = "政策课题组会后流程-审核员批准"; QueryWrapper queryWrapper2 = new QueryWrapper(); @@ -72,7 +58,6 @@ public class InputInformationAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - // 存储当前节点意见 if (null!=object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -98,16 +83,6 @@ public class InputInformationAfter 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("业务经理审批"); - busProcessNewNext.setUserId(object.getString("jlUserId")); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); } } } 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 b81e8f66..d9124374 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 @@ -26,7 +26,7 @@ public class InputInformationBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment2?prcType=19"); + one1.setLink("zchhStep2?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 f1c7a6a7..a8446f37 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 @@ -35,15 +35,20 @@ public class PRGAMStartAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); - if(StringUtils.isNotBlank(object.getString("applicantId"))){ - delegateTask.setVariable("inputInformation", object.getString("applicantId")); - nextUserList.add(object.getString("applicantId")); - } + //auto 判断流程是否是自动发起的 + if ("1".equals(object.getString("auto"))){ + delegateTask.setVariable("inputInformation", object.getString("revisionId")); + nextUserList.add(object.getString("revisionId")); + } + else { + if (StringUtils.isNotBlank(object.getString("applicantId"))) { + delegateTask.setVariable("inputInformation", object.getString("applicantId")); + nextUserList.add(object.getString("applicantId")); + } + } //截止时间 流程描述 创建人 -// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("revisionId"); delegateTask.setVariable("createUser",user); String username = object.getString("revisionIdName"); 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 4a0bbcd3..1ee02716 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 @@ -26,7 +26,6 @@ public class RevisionInformationAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -43,15 +42,9 @@ public class RevisionInformationAfter implements TaskListener { } //截止时间 流程描述 创建人 -// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); 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 { -// prcName = standName + "-标准法规清单申请-经理审批"; -// } QueryWrapper queryWrapper2 = new QueryWrapper(); @@ -65,7 +58,6 @@ public class RevisionInformationAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - // 存储当前节点意见 if (null!=object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -91,16 +83,6 @@ public class RevisionInformationAfter 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("业务经理审批"); - busProcessNewNext.setUserId(object.getString("jlUserId")); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); } } } 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 47d49dc4..6979c05c 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 @@ -26,7 +26,7 @@ public class RevisionInformationBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment2?prcType=19"); + one1.setLink("zchhStep1?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 82f2599a..c69608ef 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 @@ -26,8 +26,6 @@ public class MinisterApprovalAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -36,11 +34,6 @@ public class MinisterApprovalAfter 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 user = delegateTask.getVariable("createUser",String.class); String username = delegateTask.getVariable("createUserName",String.class); String prcName=""; @@ -67,13 +60,6 @@ public class MinisterApprovalAfter implements TaskListener { } -// if(object.getString("signFlag").equals("1")) { -// prcName = standName + "-标准法规清单申请-会签"; -// }else { -// prcName = standName + "-标准法规清单申请-经理审批"; -// } - - QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -85,7 +71,6 @@ public class MinisterApprovalAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - // 存储当前节点意见 if (null!=object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -111,16 +96,6 @@ public class MinisterApprovalAfter 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("业务经理审批"); - busProcessNewNext.setUserId(object.getString("jlUserId")); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); } } } 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 5ca46dbe..7a1500fc 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 @@ -26,7 +26,7 @@ public class MinisterApprovalBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment2?prcType=18"); + one1.setLink("zcchStep3?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 a96ecdf3..627d58d3 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 @@ -26,8 +26,6 @@ public class PRGAMStartAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -50,11 +48,6 @@ public class PRGAMStartAfter implements TaskListener { delegateTask.setVariable("createUserName",username); String prcName = ""; prcName= "政策课题组参会流程-法规认证部副部长审核"; -// if(object.getString("signFlag").equals("1")) { -// prcName = standName + "-标准法规清单申请-会签"; -// }else { -// prcName = standName + "标准法规清单申请-经理审批"; -// } QueryWrapper queryWrapper2 = new QueryWrapper(); @@ -68,7 +61,6 @@ public class PRGAMStartAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - // 存储当前节点意见 if (null!=object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -94,16 +86,6 @@ public class PRGAMStartAfter 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("业务经理审批"); - busProcessNewNext.setUserId(object.getString("jlUserId")); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); } } } 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 75960693..b5010546 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 @@ -14,7 +14,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; public class PresidentApprovalAfter implements TaskListener { @@ -26,8 +28,6 @@ public class PresidentApprovalAfter implements TaskListener { //流程信息 IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - //根据流程id找到流程信息 QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); @@ -37,15 +37,11 @@ public class PresidentApprovalAfter 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 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 = "政策课题组参会流程"; @@ -59,14 +55,14 @@ public class PresidentApprovalAfter implements TaskListener { } - - - - + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ + if("1".equals(object.getString("gsfz"))){ + one1.setOverTime(OVERTIME); + } one1.setPrcType("18"); one1.setPrcName(prcName); one1.setCreatUser(user); @@ -74,7 +70,6 @@ public class PresidentApprovalAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - // 存储当前节点意见 if (null!=object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -106,8 +101,7 @@ public class PresidentApprovalAfter implements TaskListener { busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setFinishFlag("0"); - busProcessNewNext.setTaskInfo("业务经理审批"); - busProcessNewNext.setUserId(object.getString("jlUserId")); + busProcessNewNext.setTaskInfo("政策课题组参会流程-流程结束"); busProcessNewNext.setPrcName(prcName); busBean.save(busProcessNewNext); } 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 1e194949..e138d2a0 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 @@ -26,7 +26,7 @@ public class PresidentApprovalBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment2?prcType=18"); + one1.setLink("zcchStep2?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 5ae077f5..e4f0d526 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 @@ -36,13 +36,6 @@ public class RevisionInformationAfter 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=""; @@ -55,13 +48,6 @@ public class RevisionInformationAfter implements TaskListener { } -// if(object.getString("signFlag").equals("1")) { -// prcName = standName + "-标准法规清单申请-会签"; -// }else { -// prcName = standName + "-标准法规清单申请-经理审批"; -// } - - QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -73,7 +59,6 @@ public class RevisionInformationAfter implements TaskListener { busProcessNameService.saveOrUpdate(one1); } // 存储当前节点意见 - // 存储当前节点意见 if(nextUserList != null && !nextUserList.isEmpty()){ for(String nextUser : nextUserList){ @@ -88,16 +73,6 @@ public class RevisionInformationAfter 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("业务经理审批"); - busProcessNewNext.setUserId(object.getString("jlUserId")); - busProcessNewNext.setPrcName(prcName); - busBean.save(busProcessNewNext); } } } 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 31f60396..98440476 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 @@ -26,7 +26,7 @@ public class RevisionInformationBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment2?prcType=18"); + one1.setLink("zcchStep1-1?prcType=18"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java index 3c56c0cb..ec16dc22 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java @@ -26,7 +26,7 @@ public class PGREPresidentApprovalBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bzqdfbStep3?prcType=17"); + one1.setLink("zcrhStep4?prcType=17"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java index 204823aa..9842c401 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java @@ -26,7 +26,7 @@ public class PRGEInspectorApprovalBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment3?prcType=17"); + one1.setLink("zcrhStep3?prcType=17"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java index 4d19b060..ed466925 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java @@ -30,7 +30,7 @@ public class PRGEMinisterConfirmBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("policyResearchGroupEnrollment2?prcType=17"); + one1.setLink("zcrhStep2?prcType=17"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } 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 86afc073..79885261 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 @@ -52,13 +52,12 @@ public class PRGEStartAfter implements TaskListener { //截止时间 流程描述 创建人 -// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("revisionId"); delegateTask.setVariable("createUser",user); String username = object.getString("revisionIdName"); delegateTask.setVariable("createUserName",username); String prcName=""; - prcName = "标准化活动入会流程-法规认证部副部长审核"; + prcName = "政策课题组入会流程-法规认证部副部长审核"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationBefore.java index 5b8fb276..8a9afaca 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationBefore.java @@ -26,7 +26,7 @@ public class RevisionInformationBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bzqdfbStep3?prcType=17"); + one1.setLink("zcrhStep1-1?prcType=17"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/resources/mapper/datas/BusProcessNewMapper.xml b/src/main/resources/mapper/datas/BusProcessNewMapper.xml index a49542f8..56294e89 100644 --- a/src/main/resources/mapper/datas/BusProcessNewMapper.xml +++ b/src/main/resources/mapper/datas/BusProcessNewMapper.xml @@ -4,24 +4,24 @@ SELECT - * - FROM - bus_process_new - WHERE - MESG -> '$.endTime' LIKE CONCAT( - '%',CONCAT(date_sub(DATE_FORMAT(NOW(), '%Y-%m-%d'),interval 1 day),'%')) + * + FROM + bus_process_new + WHERE + MESG -> '$.time2' LIKE CONCAT( + '%', + CONCAT( date_sub( DATE_FORMAT( NOW(), '%Y-%m-%d' ), INTERVAL 1 DAY), '%')) and TASK_INFO = '政策课题组参会流程-流程结束'