From 6b6dc8d15487458df00b451798f64464225892cd Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 20 Oct 2021 15:46:20 +0800 Subject: [PATCH 01/35] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChargeVerifyAfter.java | 90 ++++++++++++++++++ .../ChargeVerifyBefore.java | 11 +++ .../DirectorChooseAfter.java | 90 ++++++++++++++++++ .../DirectorChooseBefore.java | 11 +++ .../EngineerReviseAfter.java | 90 ++++++++++++++++++ .../EngineerReviseBefore.java | 11 +++ .../EngineerReviseDoneAfter.java | 90 ++++++++++++++++++ .../EngineerReviseDoneBefore.java | 11 +++ .../LeaderVerifyAfter.java | 90 ++++++++++++++++++ .../LeaderVerifyBefore.java | 11 +++ .../ManageSignAfter.java | 90 ++++++++++++++++++ .../ManageSignBefore.java | 11 +++ .../PresidentVerifyAfter.java | 90 ++++++++++++++++++ .../PresidentVerifyBefore.java | 11 +++ .../WriteMasterialAfter.java | 91 +++++++++++++++++++ .../WriteMaterialBefore.java | 12 +++ .../WriteMemberInfoAfter.java | 90 ++++++++++++++++++ .../WriteMemberInfoBefore.java | 11 +++ 18 files changed, 911 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMasterialAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java new file mode 100644 index 00000000..6509d69c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java @@ -0,0 +1,90 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class ChargeVerifyAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + // 入会申请信息重新封装 + if(StringUtils.isNotBlank(object.getString("handler"))) { + + if (object.getString("handler").contains(",")) { + nextUserList = Arrays.asList(object.getString("handler").split(",")); + } else { + nextUserList.add(object.getString("handler")); + } + // 配置多实例 + delegateTask.setVariable("handler", nextUserList); + } + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/standardApplyMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java new file mode 100644 index 00000000..973895b0 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class ChargeVerifyBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("ChargeVerifyBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java new file mode 100644 index 00000000..bc0772d9 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java @@ -0,0 +1,90 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class DirectorChooseAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + // 入会申请信息重新封装 + if(StringUtils.isNotBlank(object.getString("handler"))) { + + if (object.getString("handler").contains(",")) { + nextUserList = Arrays.asList(object.getString("handler").split(",")); + } else { + nextUserList.add(object.getString("handler")); + } + // 配置多实例 + delegateTask.setVariable("handler", nextUserList); + } + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/standardApplyMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java new file mode 100644 index 00000000..1d35c523 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class DirectorChooseBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("DirectorChooseBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java new file mode 100644 index 00000000..fbc6e15c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java @@ -0,0 +1,90 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class EngineerReviseAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + // 入会申请信息重新封装 + if(StringUtils.isNotBlank(object.getString("handler"))) { + + if (object.getString("handler").contains(",")) { + nextUserList = Arrays.asList(object.getString("handler").split(",")); + } else { + nextUserList.add(object.getString("handler")); + } + // 配置多实例 + delegateTask.setVariable("handler", nextUserList); + } + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/standardApplyMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java new file mode 100644 index 00000000..f4dea6d0 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class EngineerReviseBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("EngineerReviseBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java new file mode 100644 index 00000000..2d8a293e --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java @@ -0,0 +1,90 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class EngineerReviseDoneAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + // 入会申请信息重新封装 + if(StringUtils.isNotBlank(object.getString("handler"))) { + + if (object.getString("handler").contains(",")) { + nextUserList = Arrays.asList(object.getString("handler").split(",")); + } else { + nextUserList.add(object.getString("handler")); + } + // 配置多实例 + delegateTask.setVariable("handler", nextUserList); + } + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/standardApplyMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java new file mode 100644 index 00000000..383bd819 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class EngineerReviseDoneBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("EngineerReviseDoneBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java new file mode 100644 index 00000000..9d9d4cda --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java @@ -0,0 +1,90 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class LeaderVerifyAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + // 入会申请信息重新封装 + if(StringUtils.isNotBlank(object.getString("handler"))) { + + if (object.getString("handler").contains(",")) { + nextUserList = Arrays.asList(object.getString("handler").split(",")); + } else { + nextUserList.add(object.getString("handler")); + } + // 配置多实例 + delegateTask.setVariable("handler", nextUserList); + } + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/standardApplyMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java new file mode 100644 index 00000000..48074192 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class LeaderVerifyBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("LeaderVerifyBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java new file mode 100644 index 00000000..e2e038b8 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java @@ -0,0 +1,90 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class ManageSignAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + // 入会申请信息重新封装 + if(StringUtils.isNotBlank(object.getString("handler"))) { + + if (object.getString("handler").contains(",")) { + nextUserList = Arrays.asList(object.getString("handler").split(",")); + } else { + nextUserList.add(object.getString("handler")); + } + // 配置多实例 + delegateTask.setVariable("handler", nextUserList); + } + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/standardApplyMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java new file mode 100644 index 00000000..fef0c7f9 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class ManageSignBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("ManageSignBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java new file mode 100644 index 00000000..776fb38e --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java @@ -0,0 +1,90 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class PresidentVerifyAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + // 入会申请信息重新封装 + if(StringUtils.isNotBlank(object.getString("handler"))) { + + if (object.getString("handler").contains(",")) { + nextUserList = Arrays.asList(object.getString("handler").split(",")); + } else { + nextUserList.add(object.getString("handler")); + } + // 配置多实例 + delegateTask.setVariable("handler", nextUserList); + } + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/standardApplyMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java new file mode 100644 index 00000000..1899822d --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class PresidentVerifyBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("PresidentVerifyBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMasterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMasterialAfter.java new file mode 100644 index 00000000..c11e547e --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMasterialAfter.java @@ -0,0 +1,91 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class WriteMasterialAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + // 入会申请信息重新封装 + if(StringUtils.isNotBlank(object.getString("handler"))) { + + if (object.getString("handler").contains(",")) { + nextUserList = Arrays.asList(object.getString("handler").split(",")); + } else { + nextUserList.add(object.getString("handler")); + } + // 配置多实例 + delegateTask.setVariable("handler", nextUserList); + } + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/standardApplyMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java new file mode 100644 index 00000000..cc7868e6 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java @@ -0,0 +1,12 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class WriteMaterialBefore implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("WriteMaterial-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java new file mode 100644 index 00000000..37ff1b52 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java @@ -0,0 +1,90 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class WriteMemberInfoAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + // 入会申请信息重新封装 + if(StringUtils.isNotBlank(object.getString("handler"))) { + + if (object.getString("handler").contains(",")) { + nextUserList = Arrays.asList(object.getString("handler").split(",")); + } else { + nextUserList.add(object.getString("handler")); + } + // 配置多实例 + delegateTask.setVariable("handler", nextUserList); + } + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/standardApplyMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java new file mode 100644 index 00000000..042cab05 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class WriteMemberInfoBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("WriteMemberInfoBefore-前置启动"); + } +} From adb59a380a557b7ea9e1610f4a7da635f9fc606f Mon Sep 17 00:00:00 2001 From: Kevin Date: Wed, 20 Oct 2021 16:17:03 +0800 Subject: [PATCH 02/35] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/standardApplyMeetProcess/ChargeVerifyAfter.java | 3 +++ .../listener/standardApplyMeetProcess/DirectorChooseAfter.java | 3 +++ .../listener/standardApplyMeetProcess/EngineerReviseAfter.java | 3 +++ .../standardApplyMeetProcess/EngineerReviseDoneAfter.java | 3 +++ .../listener/standardApplyMeetProcess/LeaderVerifyAfter.java | 3 +++ .../listener/standardApplyMeetProcess/ManageSignAfter.java | 3 +++ .../standardApplyMeetProcess/PresidentVerifyAfter.java | 3 +++ .../listener/standardApplyMeetProcess/WriteMasterialAfter.java | 3 +++ .../standardApplyMeetProcess/WriteMemberInfoAfter.java | 3 +++ 9 files changed, 27 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index 6509d69c..c42146c5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * chargeVerify - 入会人员所在部门负责人审核 + */ public class ChargeVerifyAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java index bc0772d9..6f0bdf5a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * DirectorChoose - 技术委员会分委会主任/入会代表所在中心主任提名入会代表 + */ public class DirectorChooseAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index fbc6e15c..a5be153c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * EngineerRevise - 标准法规工程师汇总修订 + */ public class EngineerReviseAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java index 2d8a293e..db3c07f9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * EngineerReviseDone - 标准法规工程师汇总修订 + */ public class EngineerReviseDoneAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index 9d9d4cda..c2da90d8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * LeaderVerify - 标准法规部主管领导审核 + */ public class LeaderVerifyAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java index e2e038b8..6d20a208 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * ManageSign - 费用管理部门会签 + */ public class ManageSignAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index 776fb38e..599f6ca4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * PresidentVerify - 技术委员会常务副主任/总院院长审定 + */ public class PresidentVerifyAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMasterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMasterialAfter.java index c11e547e..383bfaa3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMasterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMasterialAfter.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * WriteMasterial - 标准法规工程师填写入会资料 + */ public class WriteMasterialAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index 37ff1b52..c0f08f6d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java @@ -18,6 +18,9 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +/** + * WriteMemberInfo - 入会代表填写入会信息表 + */ public class WriteMemberInfoAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { From ce2cbc250a29a55258e0231dbc00ecbb38d6533c Mon Sep 17 00:00:00 2001 From: Kevin Date: Sun, 24 Oct 2021 22:10:44 +0800 Subject: [PATCH 03/35] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B-Version1-?= =?UTF-8?q?=E5=BC=A0=E8=B6=85=E7=84=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChargeVerifyAfter.java | 62 +++++++++-- .../DirectorChooseAfter.java | 37 +++++-- .../EngineerReviseAfter.java | 14 +-- .../EngineerReviseDoneAfter.java | 18 ++-- .../LeaderVerifyAfter.java | 41 +++++-- .../ManageSignAfter.java | 44 ++++++-- .../PresidentVerifyAfter.java | 32 ++++-- .../WriteMasterialAfter.java | 94 ---------------- .../WriteMaterialAfter.java | 100 ++++++++++++++++++ .../WriteMemberInfoAfter.java | 17 ++- 10 files changed, 292 insertions(+), 167 deletions(-) delete mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMasterialAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index c42146c5..1364e01f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java @@ -1,5 +1,6 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; @@ -10,6 +11,7 @@ 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 io.swagger.models.auth.In; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; @@ -39,20 +41,57 @@ public class ChargeVerifyAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); - // 入会申请信息重新封装 - if(StringUtils.isNotBlank(object.getString("handler"))) { - if (object.getString("handler").contains(",")) { - nextUserList = Arrays.asList(object.getString("handler").split(",")); - } else { - nextUserList.add(object.getString("handler")); - } - // 配置多实例 - delegateTask.setVariable("handler", nextUserList); + + Integer count = 0; + + if(null == delegateTask.getVariable("chargePassCount")){ + delegateTask.setVariable("chargePassCount",count); } + JSONArray objects = new JSONArray(); + if(null == delegateTask.getVariable("chargePassList")) { + delegateTask.setVariable("chargePassList", objects); + } + // 审批 + if("1".equals(object.getString("passFlag"))){//通过 + delegateTask.setVariable("pass2",1);//排他通道 + count = delegateTask.getVariable("chargePassCount",Integer.class); + delegateTask.setVariable("chargePassCount",count + 1); + objects = delegateTask.getVariable("chargePassList",JSONArray.class); + objects.add(object); + delegateTask.setVariable("chargePassList",objects); + System.out.println(delegateTask.getVariable("chargePassList")); + if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); + }//下一节点 + } + }else{ + delegateTask.setVariable("pass2",0);//排他通道 + if(StringUtils.isNotBlank(object.getString("member"))) { + nextUserList.add(object.getString("member")); + delegateTask.setVariable("member", nextUserList); + }//驳回重写 + } +// 存储当前节点意见 + 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); + } + } + + + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); @@ -80,7 +119,8 @@ public class ChargeVerifyAfter implements TaskListener { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); - busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setMesg(objects.toJSONString()); +// busProcessNewNext.setMesg(object.toJSONString()); busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java index 6f0bdf5a..17339c6c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java @@ -41,17 +41,38 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); + System.out.println("后置搭建完成"); + //如果 他是通过 passFlag==1 + List passMemberList = new ArrayList<>(); + if(null == delegateTask.getVariable("memberList")){ + delegateTask.setVariable("memberList", passMemberList); + } - // 入会申请信息重新封装 - if(StringUtils.isNotBlank(object.getString("handler"))) { + if("1".equals(object.getString("passFlag"))) { + nextUserList.add(object.getString("memberId")); + if (null!=delegateTask.getVariable("memberList")) { + List middle=delegateTask.getVariable("memberList",List.class); + middle.addAll(nextUserList); + delegateTask.setVariable("memberList",middle); + }else { + delegateTask.setVariable("memberList",nextUserList); + } + delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); + } - if (object.getString("handler").contains(",")) { - nextUserList = Arrays.asList(object.getString("handler").split(",")); - } else { - nextUserList.add(object.getString("handler")); + + // 存储当前节点意见 + 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); } - // 配置多实例 - delegateTask.setVariable("handler", nextUserList); } //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index a5be153c..b6e0d4b2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java @@ -42,17 +42,11 @@ public class EngineerReviseAfter implements TaskListener { List nextUserList = new ArrayList(); - // 入会申请信息重新封装 - if(StringUtils.isNotBlank(object.getString("handler"))) { - - if (object.getString("handler").contains(",")) { - nextUserList = Arrays.asList(object.getString("handler").split(",")); - } else { - nextUserList.add(object.getString("handler")); - } - // 配置多实例 - delegateTask.setVariable("handler", nextUserList); + if (StringUtils.isNotBlank(object.getString("leader"))) { + nextUserList.add(object.getString("leader")); + delegateTask.setVariable("leader", nextUserList); } + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java index db3c07f9..e842f4da 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java @@ -14,8 +14,10 @@ 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.Arrays; +import java.util.Date; import java.util.List; /** @@ -42,18 +44,14 @@ public class EngineerReviseDoneAfter implements TaskListener { List nextUserList = new ArrayList(); - // 入会申请信息重新封装 - if(StringUtils.isNotBlank(object.getString("handler"))) { - if (object.getString("handler").contains(",")) { - nextUserList = Arrays.asList(object.getString("handler").split(",")); - } else { - nextUserList.add(object.getString("handler")); - } - // 配置多实例 - delegateTask.setVariable("handler", nextUserList); - } + + + + + //截止时间 流程描述 创建人 + 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"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index c2da90d8..b93f2208 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java @@ -42,17 +42,42 @@ public class LeaderVerifyAfter implements TaskListener { List nextUserList = new ArrayList(); - // 入会申请信息重新封装 - if(StringUtils.isNotBlank(object.getString("handler"))) { + if("1".equals(object.getString("passFlag"))) {//通过 + delegateTask.setVariable("pass3",1); + if(StringUtils.isNotBlank(object.getString("manageDepartmentList"))) { + + if (object.getString("manageDepartmentList").contains(",")) { + nextUserList = Arrays.asList(object.getString("manageDepartmentList").split(",")); + } else { + nextUserList.add(object.getString("manageDepartmentList")); + } + // 配置多实例 + delegateTask.setVariable("manageDepartmentList", nextUserList); + delegateTask.setVariable("manageDepartmentCount",nextUserList.size()); - if (object.getString("handler").contains(",")) { - nextUserList = Arrays.asList(object.getString("handler").split(",")); - } else { - nextUserList.add(object.getString("handler")); } - // 配置多实例 - delegateTask.setVariable("handler", nextUserList); + }else{ + delegateTask.setVariable("pass3",0); + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); + } } + // 存储当前节点意见 + 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); + } + } + + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java index 6d20a208..9748c319 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java @@ -15,7 +15,6 @@ import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -41,17 +40,42 @@ public class ManageSignAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); + Integer count = 0; + if(null == delegateTask.getVariable("managePassCount")){ + delegateTask.setVariable("managePassCount",count); + } + // + if("1".equals(object.getString("passFlag"))) {//通过 + count = delegateTask.getVariable("managePassCount",Integer.class); + count++; + delegateTask.setVariable("managePassCount",count); + if(delegateTask.getVariable("managePassCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ + if(StringUtils.isNotBlank(object.getString("president"))) { + nextUserList.add(object.getString("president")); + delegateTask.setVariable("president", nextUserList); + } + delegateTask.setVariable("pass4",1); + } - // 入会申请信息重新封装 - if(StringUtils.isNotBlank(object.getString("handler"))) { - - if (object.getString("handler").contains(",")) { - nextUserList = Arrays.asList(object.getString("handler").split(",")); - } else { - nextUserList.add(object.getString("handler")); + }else{ + delegateTask.setVariable("pass4",0); + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); + } + } +// 存储当前节点意见 + 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); } - // 配置多实例 - delegateTask.setVariable("handler", nextUserList); } //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index 599f6ca4..e427b437 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java @@ -43,16 +43,34 @@ public class PresidentVerifyAfter implements TaskListener { List nextUserList = new ArrayList(); // 入会申请信息重新封装 - if(StringUtils.isNotBlank(object.getString("handler"))) { + if("1".equals(object.getString("passFlag"))) {//通过 + delegateTask.setVariable("pass5",1); + if(StringUtils.isNotBlank(object.getString("engineerSumDone"))) { + nextUserList.add(object.getString("engineerSumDone")); + delegateTask.setVariable("engineerSumDone", nextUserList); + } - if (object.getString("handler").contains(",")) { - nextUserList = Arrays.asList(object.getString("handler").split(",")); - } else { - nextUserList.add(object.getString("handler")); + }else{ + delegateTask.setVariable("pass5",0); + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); } - // 配置多实例 - delegateTask.setVariable("handler", nextUserList); } + // 存储当前节点意见 + 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); + } + } + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMasterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMasterialAfter.java deleted file mode 100644 index 383bfaa3..00000000 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMasterialAfter.java +++ /dev/null @@ -1,94 +0,0 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; - -import com.alibaba.fastjson.JSONObject; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; -import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; -import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; -import com.ydw.bat.wkflow.business_main.datas.entity.Datas; -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 org.apache.commons.lang.StringUtils; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -/** - * WriteMasterial - 标准法规工程师填写入会资料 - */ -public class WriteMasterialAfter 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); - - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); - - //根据流程id找到流程信息 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); - Datas datas = datasService.getOne(queryWrapper); - - JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); - delegateTask.setVariable("objectJson",object); - - List nextUserList = new ArrayList(); - - // 入会申请信息重新封装 - if(StringUtils.isNotBlank(object.getString("handler"))) { - - if (object.getString("handler").contains(",")) { - nextUserList = Arrays.asList(object.getString("handler").split(",")); - } else { - nextUserList.add(object.getString("handler")); - } - // 配置多实例 - delegateTask.setVariable("handler", nextUserList); - } - //截止时间 流程描述 创建人 - 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); - if (one1 != null) { - one1.setPrcType("11"); - 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/standardApplyMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java new file mode 100644 index 00000000..220f80a7 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java @@ -0,0 +1,100 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +/** + * WriteMasterial - 标准法规工程师填写入会资料 + */ +public class WriteMaterialAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + // 入会申请信息重新封装 + if(StringUtils.isNotBlank(object.getString("directorList"))) { + + if (object.getString("directorList").contains(",")) { + nextUserList = Arrays.asList(object.getString("directorList").split(",")); + } else { + nextUserList.add(object.getString("directorList")); + } + // 配置多实例 + delegateTask.setVariable("directorList", nextUserList); + } + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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());//流程实例Id + busProcessNewNext.setMesg(object.toJSONString());//信息 + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());//节点信息 + busProcessNewNext.setFinishFlag("0");//完成注记 + busProcessNewNext.setTaskInfo(delegateTask.getName());//节点信息 + busProcessNewNext.setUserId(nextUser);//处理人 + busProcessNewNext.setPrcName(prcName);//流程名 + busBean.save(busProcessNewNext); + System.out.println("---------------------user1--------------"); + System.out.println("处理人:" + nextUser); + System.out.println("流程名:" + prcName); + System.out.println("节点信息:" + delegateTask.getName()); + } + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index c0f08f6d..efc4ed1f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java @@ -22,6 +22,7 @@ import java.util.List; * WriteMemberInfo - 入会代表填写入会信息表 */ public class WriteMemberInfoAfter implements TaskListener { + @Override public void notify(DelegateTask delegateTask) { IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); @@ -42,17 +43,15 @@ public class WriteMemberInfoAfter implements TaskListener { List nextUserList = new ArrayList(); - // 入会申请信息重新封装 - if(StringUtils.isNotBlank(object.getString("handler"))) { - if (object.getString("handler").contains(",")) { - nextUserList = Arrays.asList(object.getString("handler").split(",")); - } else { - nextUserList.add(object.getString("handler")); - } - // 配置多实例 - delegateTask.setVariable("handler", nextUserList); + // + if(StringUtils.isNotBlank(object.getString("charge"))) { + nextUserList.add(object.getString("charge")); + delegateTask.setVariable("charge", nextUserList); + System.out.println(delegateTask.getVariable("charge")); } + + //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); delegateTask.setVariable("createUser", user); From 3c586badee7b16d86416c227c25f8b8a6ec773d0 Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Mon, 25 Oct 2021 09:55:24 +0800 Subject: [PATCH 04/35] =?UTF-8?q?=E6=9D=8E=E5=A5=A5=20=E5=A4=96=E9=83=A8?= =?UTF-8?q?=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_auth/LawsUserInfoService.java | 2 +- .../RecommendedApproval/RAApproveAfter.java | 132 ++++++++++++++++++ .../RecommendedApproval/RAApproveBefore.java | 34 +++++ .../RecommendedApproval/RAAuditAfter.java | 114 +++++++++++++++ .../RecommendedApproval/RAAuditBefore.java | 34 +++++ .../RAModifyInformationAfter.java | 87 ++++++++++++ .../RAModifyInformationBefore.java | 34 +++++ .../RecommendedApproval/RASignAfter.java | 114 +++++++++++++++ .../RecommendedApproval/RASignBefore.java | 34 +++++ .../RAValidationAfter.java | 115 +++++++++++++++ .../RAValidationBefore.java | 35 +++++ .../RecommendedApproval/RAstartAfter.java | 89 ++++++++++++ .../RecommendedApproval/RAstartBefore.java | 21 +++ src/main/resources/application.yml | 2 +- 14 files changed, 845 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 07a67b75..4223c428 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Set; @Component -@FeignClient(value = "FotonLAWSSystem",path="/api",url="") +@FeignClient(value = "FotonLAWSSystemLeo",path="/api",url="") @RequestMapping("/") public interface LawsUserInfoService { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java new file mode 100644 index 00000000..cadc3e26 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java @@ -0,0 +1,132 @@ +package com.ydw.bat.wkflow.listener.RecommendedApproval; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; + import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; + import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; + import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; + import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; + 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.ActivitiException; + 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.Arrays; + import java.util.Date; + import java.util.List; + import java.util.regex.Matcher; + import java.util.regex.Pattern; + +public class RAApproveAfter implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.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()); + + String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); + + + if("1".equalsIgnoreCase(approvalOpinion)){ + delegateTask.setVariable("yzFlag",1); + delegateTask.setVariable("applyUserId",object.getString("applyUpdUserId")); + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busProcessNew.setUserId(object.getString("applyUpdUserId")); + busProcessNew.setPrcName(delegateTask.getVariable("listName",String.class)+"-外部署名推荐批准-修改信息"); + busBean.save(busProcessNew); + + func1(delegateTask, busBean, object,"1"); + }else { + SarLawsDetailedList lawsDetailedList=lawsUserInfoService.getStandById(object.getString("standId")); + if (null!=lawsDetailedList){ + DetailedUpDto detailed=new DetailedUpDto(); + detailed.setId(object.getString("standId")); + detailed.setApplicationScope(object.getString("applyRegion")); + detailed.setFileIds(object.getString("fileId")); + detailed.setRemark(object.getString("descriptionList")); +// detailed.setInforlist(object.getString("inforlist")); + JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList")); + String info=""; + String putTime=""; + String zccTime=""; + String xcxTime=""; +// for (Object o: jsonArray) { +// JSONObject object1=JSONObject.parseObject(o.toString()); +// info=info+object1.getString("id")+","; +// putTime=putTime+object1.getString("issueTime")+","; +// zccTime=zccTime+object1.getString("ZCCSSRQ")+","; +// xcxTime=xcxTime+object1.getString("XCXSSRQ")+","; +// } +// detailed.setInforlist(info.substring(0,info.length()-1)); +// detailed.setInforlist1(putTime.substring(0,putTime.length()-1)); +// detailed.setInforlist2(zccTime.substring(0,zccTime.length()-1)); +// detailed.setInforlist3(xcxTime.substring(0,xcxTime.length()-1)); +// detailed.setDetailedListState("1"); +// Date date=new Date(); +// SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// detailed.setDetailedListVision(simpleDateFormat.format(date)); +// lawsUserInfoService.updateLaws(detailed); + }else { + throw new ActivitiException("清单信息不存在，若多次出现此信息请联系管理员！！！"); + } + delegateTask.setVariable("yzFlag",2); + func2(delegateTask, busBean, object,"0",busProcessNameService); + + } + + } + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object,String commitFlag) { + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID",delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if(one1!=null){ + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object,String commitFlag ,IBusProcessNameService busProcessNameService) { + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + if(one2!=null){ + one2.setOverTime(OVERTIME); + one2.setPrcType("16"); + busProcessNameService.saveOrUpdate(one2); + } + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID",delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if(one1!=null){ + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } +} \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveBefore.java new file mode 100644 index 00000000..7d69c72f --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveBefore.java @@ -0,0 +1,34 @@ +package com.ydw.bat.wkflow.listener.RecommendedApproval; + +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 RAApproveBefore 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("bzqdfbStep5?prcType=16"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java new file mode 100644 index 00000000..ce7e8048 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java @@ -0,0 +1,114 @@ +package com.ydw.bat.wkflow.listener.RecommendedApproval; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; +import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; +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.ActivitiException; +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.Arrays; +import java.util.Date; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class RAAuditAfter 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("director", object.getString("directUser")); + nextUserList.add(object.getString("directUser")); + delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); + nextUserList.add(object.getString("directorUser")); + +// 逻辑判断是否会签 signFlag + + if(object.getString("signFlag").equals("1")) { + delegateTask.setVariable("bzFlag", 1); + if (StringUtils.isNotBlank(object.getString("directUser"))) { + + if (object.getString("directUser").contains(",")) { + nextUserList = Arrays.asList(object.getString("directUser").split(",")); + } else { + nextUserList.add(object.getString("directUser")); + } + } + } else { + delegateTask.setVariable("bzFlag", 2); + if (StringUtils.isNotBlank(object.getString("directorUser"))) { + delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); + nextUserList.add(object.getString("directorUser")); + } + } + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("prcCreateUser", user); + delegateTask.setVariable("prcCreateUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; + 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); + + if(one1!=null){ + one1.setPrcType("16"); + 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/RecommendedApproval/RAAuditBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditBefore.java new file mode 100644 index 00000000..045d2707 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditBefore.java @@ -0,0 +1,34 @@ +package com.ydw.bat.wkflow.listener.RecommendedApproval; + +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 RAAuditBefore 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("bzqdfbStep3?prcType=16"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java new file mode 100644 index 00000000..e5ac6093 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java @@ -0,0 +1,87 @@ +package com.ydw.bat.wkflow.listener.RecommendedApproval; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; +import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; +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.ActivitiException; +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.Arrays; +import java.util.Date; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class RAModifyInformationAfter 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("leadership", object.getString("creatUser")); + nextUserList.add(object.getString("creatUser")); + + + + + //截止时间 流程描述 创建人 + 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("16"); + 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/RecommendedApproval/RAModifyInformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationBefore.java new file mode 100644 index 00000000..038b799a --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationBefore.java @@ -0,0 +1,34 @@ +package com.ydw.bat.wkflow.listener.RecommendedApproval; + +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 RAModifyInformationBefore 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("bzqdfbStep6?prcType=16"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java new file mode 100644 index 00000000..1683321c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java @@ -0,0 +1,114 @@ +package com.ydw.bat.wkflow.listener.RecommendedApproval; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; +import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; +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.ActivitiException; +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.Arrays; +import java.util.Date; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class RASignAfter 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("statuteminister", object.getString("dockUser")); + nextUserList.add(object.getString("dockUser")); + delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); + nextUserList.add(object.getString("directorUser")); + +// 逻辑判断是否会签 signFlag + + if(object.getString("signFlag").equals("1")) { + delegateTask.setVariable("ldFlag", 1); + if (StringUtils.isNotBlank(object.getString("dockUser"))) { + + if (object.getString("dockUser").contains(",")) { + nextUserList = Arrays.asList(object.getString("dockUser").split(",")); + } else { + nextUserList.add(object.getString("dockUser")); + } + } + } else { + delegateTask.setVariable("ldFlag", 2); + if (StringUtils.isNotBlank(object.getString("directorUser"))) { + delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); + nextUserList.add(object.getString("directorUser")); + } + } + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("prcCreateUser", user); + delegateTask.setVariable("prcCreateUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; + 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); + + if(one1!=null){ + one1.setPrcType("16"); + 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/RecommendedApproval/RASignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignBefore.java new file mode 100644 index 00000000..6daf73b4 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignBefore.java @@ -0,0 +1,34 @@ +package com.ydw.bat.wkflow.listener.RecommendedApproval; + +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 RASignBefore 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=16"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java new file mode 100644 index 00000000..4760c412 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java @@ -0,0 +1,115 @@ +package com.ydw.bat.wkflow.listener.RecommendedApproval; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; +import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; +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.ActivitiException; +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.Arrays; +import java.util.Date; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class RAValidationAfter 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("dean", object.getString("deanUser")); + nextUserList.add(object.getString("deanUser")); + delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); + nextUserList.add(object.getString("directorUser")); + +// 逻辑判断是否审核 signFlag + + if(object.getString("signFlag").equals("1")) { + delegateTask.setVariable("zrFlag", 1); + + if (StringUtils.isNotBlank(object.getString("deanUser"))) { + + if (object.getString("deanUser").contains(",")) { + nextUserList = Arrays.asList(object.getString("deanUser").split(",")); + } else { + nextUserList.add(object.getString("deanUser")); + } + } + } else { + delegateTask.setVariable("zrFlag", 2); + if (StringUtils.isNotBlank(object.getString("directorUser"))) { + delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); + nextUserList.add(object.getString("directorUser")); + } + } + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("prcCreateUser", user); + delegateTask.setVariable("prcCreateUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; + 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); + + if(one1!=null){ + one1.setPrcType("16"); + 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/RecommendedApproval/RAValidationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationBefore.java new file mode 100644 index 00000000..45a75c36 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationBefore.java @@ -0,0 +1,35 @@ +package com.ydw.bat.wkflow.listener.RecommendedApproval; + +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 RAValidationBefore 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("bzqdfbStep4?prcType=16"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} + diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java new file mode 100644 index 00000000..44a23a4b --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java @@ -0,0 +1,89 @@ +package com.ydw.bat.wkflow.listener.RecommendedApproval; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; +import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; +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.ActivitiException; +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.Arrays; +import java.util.Date; +import java.util.List; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class RAstartAfter 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("leadershiplist",nextUserList); + +// 赋值署名领导 + delegateTask.setVariable("leadership", object.getString("creatUser")); + nextUserList.add(object.getString("creatUser")); + + + //截止时间 流程描述 创建人 + 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("16"); + 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/RecommendedApproval/RAstartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartBefore.java new file mode 100644 index 00000000..f2afedf7 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartBefore.java @@ -0,0 +1,21 @@ +package com.ydw.bat.wkflow.listener.RecommendedApproval; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class RAstartBefore implements TaskListener{ + @Override + public void notify(DelegateTask delegateTask) { +// IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); +// QueryWrapper queryWrapper1 = new QueryWrapper(); +// queryWrapper1.isNull("TASK_ID"); +// List list = busBean.list(queryWrapper1); +// if(!list.isEmpty()){ +// BusProcessNew one1 = list.get(0); +// one1.setTaskId(delegateTask.getId()); +// busBean.saveOrUpdate(one1); +// } + } + +} + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e0d2bdf9..59aa9518 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -18,7 +18,7 @@ eureka: defaultZone: http://62.234.136.153:8761/eureka/ spring: application: - name: bat-wkflow + name: bat-wkflow-leo http: encoding: charset: UTF-8 From 057a33899944825b134c9247d9f1013edc73daca Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Mon, 25 Oct 2021 10:03:51 +0800 Subject: [PATCH 05/35] . --- .../JoinStandardFiling/JSFIssuedAfter.java | 78 ++++++++++++++++++ .../JoinStandardFiling/JSFIssuedBefore.java | 34 ++++++++ .../JoinStandardFiling/JSFstartAfter.java | 79 +++++++++++++++++++ .../JoinStandardFiling/JSFstartBefore.java | 21 +++++ 4 files changed, 212 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartBefore.java 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 new file mode 100644 index 00000000..8c60c8b2 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedAfter.java @@ -0,0 +1,78 @@ +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("Standardizerlist",nextUserList); + +// 赋值署名领导 + delegateTask.setVariable("Standardizerlist", 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 new file mode 100644 index 00000000..419c3b9b --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedBefore.java @@ -0,0 +1,34 @@ +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 new file mode 100644 index 00000000..e145c81d --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartAfter.java @@ -0,0 +1,79 @@ +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 JSFstartAfter 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("Standardizerlist",nextUserList); + +// 赋值署名领导 + delegateTask.setVariable("Standardizer1", object.getString("creatUser")); + nextUserList.add(object.getString("creatUser")); + + + //截止时间 流程描述 创建人 + 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("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); + } + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartBefore.java new file mode 100644 index 00000000..285523eb --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFstartBefore.java @@ -0,0 +1,21 @@ +package com.ydw.bat.wkflow.listener.JoinStandardFiling; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class JSFstartBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { +// IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); +// QueryWrapper queryWrapper1 = new QueryWrapper(); +// queryWrapper1.isNull("TASK_ID"); +// List list = busBean.list(queryWrapper1); +// if(!list.isEmpty()){ +// BusProcessNew one1 = list.get(0); +// one1.setTaskId(delegateTask.getId()); +// busBean.saveOrUpdate(one1); +// } + } + +} + From 22431bac5148aaf34a17b3278107ce5c0da21d92 Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 25 Oct 2021 11:12:25 +0800 Subject: [PATCH 06/35] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8Bv2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardApplyMeetProcess/Kev.java | 51 +++++++++++++++++++ 1 file changed, 51 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java new file mode 100644 index 00000000..b1d6957b --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java @@ -0,0 +1,51 @@ +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; + + +/** + * + * |Debug|调试; |Run|运行使用; |Library|参考移植; + * + * Author:Kevin + * Version:1.2.2 + */ +public class Kev { + + + + /** + * |debug;输出方法名，类名 + */ + public static void showClassFunction(){ + StackTraceElement e = new Exception().getStackTrace()[1]; + String className = e.getClassName(); + String functionName = e.getMethodName(); +// String packageName = e.getClass().getPackage().getName(); +// String className = e.getClass().getSimpleName();//此方法方便看 +// String rat = ".\n" + packageName + "." + className + " [" + functionName + "]" + ">>>>>"; + String rat = className + " [" + functionName + "] " + ">>>>> "; + System.out.format("\33[32;4m" + rat); + } + public static void showClassFunction(int index){ + StackTraceElement e = new Exception().getStackTrace()[index]; + String className = e.getClassName(); + String functionName = e.getMethodName(); + String rat = className + " [" + functionName + "] " + ">>>>> "; + System.out.format("\33[32;4m" + rat); + } + + // 显示当前运行的函数--用于调试，将输出结果与函数名匹配输出 +// public static void showFunction(){ +// String _thisMethodName = new Exception().getStackTrace()[1].getMethodName();// 获得当前的方法名 +// String rat = "[" + _thisMethodName + "]" + ">>>>>"; +// System.out.format("\33[32;4m" + rat); +// } + + +// 显示第n级函数名 +// public static void showFunction(int index){ +// String _thisMethodName = new Exception().getStackTrace()[index].getMethodName(); +// String rat = "[" + _thisMethodName + "]" + ">>>>>"; +// System.out.format("\33[32;4m" + rat); +// } + +} \ No newline at end of file From 7df3d232fb6116a0ebd97251e063f8a6fc9bc6f1 Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 25 Oct 2021 11:26:15 +0800 Subject: [PATCH 07/35] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8Bv3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/standardApplyMeetProcess/ChargeVerifyAfter.java | 2 +- .../listener/standardApplyMeetProcess/ChargeVerifyBefore.java | 2 +- .../listener/standardApplyMeetProcess/DirectorChooseAfter.java | 2 +- .../listener/standardApplyMeetProcess/DirectorChooseBefore.java | 2 +- .../listener/standardApplyMeetProcess/EngineerReviseAfter.java | 2 +- .../listener/standardApplyMeetProcess/EngineerReviseBefore.java | 2 +- .../standardApplyMeetProcess/EngineerReviseDoneAfter.java | 2 +- .../standardApplyMeetProcess/EngineerReviseDoneBefore.java | 2 +- .../ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java | 2 +- .../listener/standardApplyMeetProcess/LeaderVerifyAfter.java | 2 +- .../listener/standardApplyMeetProcess/LeaderVerifyBefore.java | 2 +- .../listener/standardApplyMeetProcess/ManageSignAfter.java | 2 +- .../listener/standardApplyMeetProcess/ManageSignBefore.java | 2 +- .../listener/standardApplyMeetProcess/PresidentVerifyAfter.java | 2 +- .../standardApplyMeetProcess/PresidentVerifyBefore.java | 2 +- .../listener/standardApplyMeetProcess/WriteMaterialAfter.java | 2 +- .../listener/standardApplyMeetProcess/WriteMaterialBefore.java | 2 +- .../listener/standardApplyMeetProcess/WriteMemberInfoAfter.java | 2 +- .../standardApplyMeetProcess/WriteMemberInfoBefore.java | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index 1364e01f..d1c8827b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java index 973895b0..fb1345a7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java index 17339c6c..113d28a7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java index 1d35c523..100ea39a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index b6e0d4b2..8e08af6c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java index f4dea6d0..69e427cf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java index e842f4da..ffb6d9da 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java index 383bd819..00cbe8f6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java index b1d6957b..2e6df15e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; /** diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index b93f2208..d4d5102d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java index 48074192..83570c9a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java index 9748c319..d73a4c01 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java index fef0c7f9..347e5320 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index e427b437..c84f9928 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java index 1899822d..6d11b5b7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java index 220f80a7..bb801f99 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java index cc7868e6..433bd4c9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index efc4ed1f..a37d5a2d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java index 042cab05..3d3939a9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; From a39e7ba0dc4e399b210e5b8965415fefea07c622 Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Mon, 25 Oct 2021 11:34:42 +0800 Subject: [PATCH 08/35] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PGREPresidentApprovalAfter.java | 120 ++++++++++++++ .../PGREPresidentApprovalBefore.java | 34 ++++ .../PRGEInspectorApprovalAfter.java | 155 ++++++++++++++++++ .../PRGEInspectorApprovalBefore.java | 18 ++ .../PRGEMinisterConfirmAfter.java | 121 ++++++++++++++ .../PRGEMinisterConfirmBefore.java | 38 +++++ .../PRGEStartAfter.java | 116 +++++++++++++ .../PRGEStartBefore.java | 12 ++ .../RevisionInformationBefore.java | 34 ++++ .../RevisonInformationAfter.java | 115 +++++++++++++ 10 files changed, 763 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java 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 new file mode 100644 index 00000000..bf2e1e04 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalAfter.java @@ -0,0 +1,120 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; +import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; +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.ActivitiException; +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.Arrays; +import java.util.Date; +import java.util.List; + +public class PGREPresidentApprovalAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson", object); + + List nextUserList = new ArrayList(); + + if ("1".equals(object.getString("gsfz"))) { + delegateTask.setVariable("gsfz", "1"); + } else { + delegateTask.setVariable("gsfz", "0"); + if (StringUtils.isNotBlank(object.getString("revisionInformation"))) { + delegateTask.setVariable("revisionInformation", object.getString("revisionInformation")); + } + } + + + //截止时间 流程描述 创建人 + 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 = ""; +// 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); + if (one1 != null) { + one1.setPrcType("17"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + 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(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.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/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java new file mode 100644 index 00000000..ebce7963 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java @@ -0,0 +1,34 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment; + +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 PGREPresidentApprovalBefore 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("bzqdfbStep3?prcType=4"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} 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 new file mode 100644 index 00000000..535dba62 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalAfter.java @@ -0,0 +1,155 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; +import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; +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.ActivitiException; +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.Arrays; +import java.util.Date; +import java.util.List; + +public class PRGEInspectorApprovalAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson", object); + + List nextUserList = new ArrayList(); + + if ("1".equals(object.getString("fgfzj"))) { + delegateTask.setVariable("fgfzj", "1"); + if (StringUtils.isNotBlank(object.getString("presidentApproval"))) { + delegateTask.setVariable("presidentApproval", object.getString("presidentApproval")); + } + } else if ("0".equals(object.getString("fgfzj"))) { + delegateTask.setVariable("fgfzj", "0"); + if (StringUtils.isNotBlank(object.getString("revisionInformation"))){ + delegateTask.setVariable("revisionInformation", object.getString("revisionInformation")); + } + } + + +// if(object.getString("signFlag").equals("1")){ +// delegateTask.setVariable("hqFlag",1); +// +// if(StringUtils.isNotBlank(object.getString("dockUser"))){ +// +// if(object.getString("dockUser").contains(",")){ +// nextUserList = Arrays.asList(object.getString("dockUser").split(",")); +// }else { +// nextUserList.add(object.getString("dockUser")); +// } +// // 配置多实例 +// delegateTask.setVariable("hqUserList",nextUserList); +// } +// }else { +// delegateTask.setVariable("hqFlag",2); +// if(StringUtils.isNotBlank(object.getString("directorUser"))){ +// delegateTask.setVariable("managerUserId",object.getString("directorUser")); +// nextUserList.add(object.getString("directorUser")); +// } +// } +// +// //设置审批中的状态 +// SarLawsDetailedList lawsDetailedList=lawsUserInfoService.getStandById(object.getString("standId")); +// if (null!=lawsDetailedList){ +// DetailedUpDto detailed=new DetailedUpDto(); +// detailed.setId(object.getString("standId")); +// detailed.setDetailedListState("3"); +// lawsUserInfoService.updateLaws(detailed); +// }else { +// throw new ActivitiException("清单信息不存在，若多次出现此信息请联系管理员！！！"); +// } +// + //截止时间 流程描述 创建人 + 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 = ""; +// 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); + if (one1 != null) { + one1.setPrcType("17"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + 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(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.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/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java new file mode 100644 index 00000000..f30b831e --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java @@ -0,0 +1,18 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment; + +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 PRGEInspectorApprovalBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} 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 new file mode 100644 index 00000000..34976211 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmAfter.java @@ -0,0 +1,121 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; +import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; +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.ActivitiException; +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.Arrays; +import java.util.Date; +import java.util.List; + +public class PRGEMinisterConfirmAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + + if("1".equals(object.getString("fgfbz"))){ + delegateTask.setVariable("fgfbz", "1"); + if (StringUtils.isNotBlank(object.getString("inspectorApproval"))){ + delegateTask.setVariable("inspectorApproval", object.getString("inspectorApproval")); + } + }else{ + delegateTask.setVariable("fgfbz","0"); + if (StringUtils.isNotBlank(object.getString("revisionInformation"))){ + delegateTask.setVariable("revisionInformation", object.getString("revisionInformation")); + } + } + + + + //截止时间 流程描述 创建人 + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser",user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName",username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setPrcType("17"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + 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(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.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/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java new file mode 100644 index 00000000..de85db55 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java @@ -0,0 +1,38 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment; + +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 PRGEMinisterConfirmBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +// @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=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 new file mode 100644 index 00000000..25ebb302 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartAfter.java @@ -0,0 +1,116 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; +import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; +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.ActivitiException; +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.Arrays; +import java.util.Date; +import java.util.List; + +public class PRGEStartAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + if(StringUtils.isNotBlank(object.getString("ministerConfirm"))){ + delegateTask.setVariable("ministerConfirm", object.getString("ministerConfirm")); + } + + //截止时间 流程描述 创建人 +// 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=""; +// 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); + if(one1!=null){ + one1.setPrcType("17"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + 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(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.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/policyResearchGroupEnrollment/PRGEStartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartBefore.java new file mode 100644 index 00000000..c4c66ff2 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartBefore.java @@ -0,0 +1,12 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class PRGEStartBefore implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + + } +} 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 new file mode 100644 index 00000000..e0761781 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationBefore.java @@ -0,0 +1,34 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment; + +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("bzqdfbStep3?prcType=4"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} 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 new file mode 100644 index 00000000..ed44fbaf --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisonInformationAfter.java @@ -0,0 +1,115 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; +import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; +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.ActivitiException; +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.Arrays; +import java.util.Date; +import java.util.List; + +public class RevisonInformationAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson", object); + + List nextUserList = new ArrayList(); + + if (StringUtils.isNotBlank(object.getString("ministerConfirm"))) { + delegateTask.setVariable("ministerConfirm", object.getString("ministerConfirm")); + } + + + //截止时间 流程描述 创建人 + 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 = ""; +// 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); + if (one1 != null) { + one1.setPrcType("17"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + 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(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo("业务经理审批"); + busProcessNewNext.setUserId(object.getString("jlUserId")); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } +} From 63be094d3d3968beff1c7e7812f5f9f593300b96 Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 25 Oct 2021 13:24:50 +0800 Subject: [PATCH 09/35] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8Bv3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChargeVerifyAfter.java | 0 .../ChargeVerifyBefore.java | 0 .../DirectorChooseAfter.java | 0 .../DirectorChooseBefore.java | 0 .../EngineerReviseAfter.java | 0 .../EngineerReviseBefore.java | 0 .../EngineerReviseDoneAfter.java | 0 .../EngineerReviseDoneBefore.java | 0 .../Kev.java | 0 .../LeaderVerifyAfter.java | 0 .../LeaderVerifyBefore.java | 0 .../ManageSignAfter.java | 0 .../ManageSignBefore.java | 0 .../PresidentVerifyAfter.java | 0 .../PresidentVerifyBefore.java | 0 .../WriteMaterialAfter.java | 0 .../WriteMaterialBefore.java | 0 .../WriteMemberInfoAfter.java | 0 .../WriteMemberInfoBefore.java | 0 19 files changed, 0 insertions(+), 0 deletions(-) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/ChargeVerifyAfter.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/ChargeVerifyBefore.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/DirectorChooseAfter.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/DirectorChooseBefore.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/EngineerReviseAfter.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/EngineerReviseBefore.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/EngineerReviseDoneAfter.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/EngineerReviseDoneBefore.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/Kev.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/LeaderVerifyAfter.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/LeaderVerifyBefore.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/ManageSignAfter.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/ManageSignBefore.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/PresidentVerifyAfter.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/PresidentVerifyBefore.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/WriteMaterialAfter.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/WriteMaterialBefore.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/WriteMemberInfoAfter.java (100%) rename src/main/java/com/ydw/bat/wkflow/listener/{standardApplyMeetProcess => StandardApplyMeetProcess}/WriteMemberInfoBefore.java (100%) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ChargeVerifyAfter.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ChargeVerifyAfter.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ChargeVerifyBefore.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ChargeVerifyBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/DirectorChooseAfter.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/DirectorChooseAfter.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/DirectorChooseBefore.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/DirectorChooseBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseAfter.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseAfter.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseBefore.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseDoneAfter.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseDoneAfter.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseDoneBefore.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseDoneBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/Kev.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/Kev.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/LeaderVerifyAfter.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/LeaderVerifyAfter.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/LeaderVerifyBefore.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/LeaderVerifyBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignAfter.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignAfter.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignBefore.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/PresidentVerifyAfter.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/PresidentVerifyAfter.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/PresidentVerifyBefore.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/PresidentVerifyBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialAfter.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialAfter.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialBefore.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMemberInfoAfter.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMemberInfoAfter.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMemberInfoBefore.java similarity index 100% rename from src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMemberInfoBefore.java From 5a6ca2b687c1535f61a0836fad6c58095985b61e Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 25 Oct 2021 13:31:22 +0800 Subject: [PATCH 10/35] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8Bv3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/StandardApplyMeetProcess/ManageSignAfter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignAfter.java index d73a4c01..4bbbe7d5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignAfter.java @@ -44,7 +44,7 @@ public class ManageSignAfter implements TaskListener { if(null == delegateTask.getVariable("managePassCount")){ delegateTask.setVariable("managePassCount",count); } - // + //999999999 if("1".equals(object.getString("passFlag"))) {//通过 count = delegateTask.getVariable("managePassCount",Integer.class); count++; From 94335a89e7e4c37c90dcc8f5decf3e1d72c990d9 Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Mon, 25 Oct 2021 15:22:13 +0800 Subject: [PATCH 11/35] . --- .../PRFApproveAfter.java | 91 +++++++++++++++ .../PRFApproveBefore.java | 34 ++++++ .../PRFEngineerreviewAfter.java | 106 ++++++++++++++++++ .../PRFEngineerreviewBefore.java | 34 ++++++ .../PRFFillinformationAfter.java | 77 +++++++++++++ .../PRFFillinformationBefore.java | 34 ++++++ .../PRFIssuedAfter.java | 79 +++++++++++++ .../PRFIssuedBefore.java | 34 ++++++ .../PRFReviewdockAfter.java | 106 ++++++++++++++++++ .../PRFReviewdockBefore.java | 34 ++++++ .../PRFUnderengineerAfter.java | 78 +++++++++++++ .../PRFUnderengineerBefore.java | 34 ++++++ .../PRFstartAfter.java | 79 +++++++++++++ .../PRFstartBefore.java | 20 ++++ 14 files changed, 840 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFIssuedAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFIssuedBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java new file mode 100644 index 00000000..a9f4b952 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java @@ -0,0 +1,91 @@ +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.text.SimpleDateFormat; +import java.util.Date; + +public class PRFApproveAfter 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); + + String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); + + if ("1".equalsIgnoreCase(approvalOpinion)) { + delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); + + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busProcessNew.setUserId(object.getString("LiabilityengineerUser")); + busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busBean.save(busProcessNew); + + func1(delegateTask, busBean, object, "1"); + delegateTask.setVariable("bzFlag", 2); + } else { + delegateTask.setVariable("bzFlag", 1); + func2(delegateTask, busBean, object, "0", busProcessNameService); + } + } + + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + if (one2 != null) { + //one2.setPrcName("入库流程结束"); + one2.setOverTime(OVERTIME); + one2.setPrcType("1"); + busProcessNameService.saveOrUpdate(one2); + } + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } +} 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 new file mode 100644 index 00000000..2b7a419c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveBefore.java @@ -0,0 +1,34 @@ +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 PRFApproveBefore 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("bzqdfbStep7?prcType=14"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java new file mode 100644 index 00000000..30d27127 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewAfter.java @@ -0,0 +1,106 @@ +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class PRFEngineerreviewAfter 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("statuteminister", object.getString("statuteministerUser")); + nextUserList.add(object.getString("statuteministerUser")); + delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); + nextUserList.add(object.getString("LiabilityengineerUser")); + +// 逻辑判断是否会签 signFlag + + if(object.getString("signFlag").equals("1")) { + delegateTask.setVariable("gcsFlag", 1); + if (StringUtils.isNotBlank(object.getString("statuteministerUser"))) { + + if (object.getString("statuteministerUser").contains(",")) { + nextUserList = Arrays.asList(object.getString("statuteministerUser").split(",")); + } else { + nextUserList.add(object.getString("statuteministerUser")); + } + } + } else { + delegateTask.setVariable("gcsFlag", 2); + if (StringUtils.isNotBlank(object.getString("LiabilityengineerUser"))) { + delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); + nextUserList.add(object.getString("LiabilityengineerUser")); + } + } + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("prcCreateUser", user); + delegateTask.setVariable("prcCreateUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; + 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); + + 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/PRFEngineerreviewBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java new file mode 100644 index 00000000..2729657f --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFEngineerreviewBefore.java @@ -0,0 +1,34 @@ +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 PRFEngineerreviewBefore 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("bzqdfbStep6?prcType=14"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java new file mode 100644 index 00000000..3d61c3cd --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationAfter.java @@ -0,0 +1,77 @@ +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 PRFFillinformationAfter 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("Buttpeople2", object.getString("Buttpeople2User")); + nextUserList.add(object.getString("Buttpeople2User")); + + + //截止时间 流程描述 创建人 + 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/PRFFillinformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java new file mode 100644 index 00000000..83267bbc --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFFillinformationBefore.java @@ -0,0 +1,34 @@ +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 PRFFillinformationBefore 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("bzqdfbStep4?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 new file mode 100644 index 00000000..97109bbf --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFIssuedAfter.java @@ -0,0 +1,79 @@ +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 new file mode 100644 index 00000000..6fff1914 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFIssuedBefore.java @@ -0,0 +1,34 @@ +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/PRFReviewdockAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java new file mode 100644 index 00000000..d1e2a44d --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java @@ -0,0 +1,106 @@ +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class PRFReviewdockAfter 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("statuteengineer", object.getString("statuteengineerUser")); + nextUserList.add(object.getString("statuteengineerUser")); + delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); + nextUserList.add(object.getString("LiabilityengineerUser")); + +// 逻辑判断是否会签 signFlag + + if(object.getString("signFlag").equals("1")) { + delegateTask.setVariable("djrFlag", 1); + if (StringUtils.isNotBlank(object.getString("statuteengineerUser"))) { + + if (object.getString("statuteengineerUser").contains(",")) { + nextUserList = Arrays.asList(object.getString("statuteengineerUser").split(",")); + } else { + nextUserList.add(object.getString("statuteengineerUser")); + } + } + } else { + delegateTask.setVariable("djrFlag", 2); + if (StringUtils.isNotBlank(object.getString("LiabilityengineerUser"))) { + delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); + nextUserList.add(object.getString("LiabilityengineerUser")); + } + } + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("prcCreateUser", user); + delegateTask.setVariable("prcCreateUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; + 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); + + 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/PRFReviewdockBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java new file mode 100644 index 00000000..a09295ce --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockBefore.java @@ -0,0 +1,34 @@ +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 PRFReviewdockBefore 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("bzqdfbStep5?prcType=14"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java new file mode 100644 index 00000000..05946437 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerAfter.java @@ -0,0 +1,78 @@ +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 PRFUnderengineerAfter 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("Liabilityengineerlist",nextUserList); + +// 赋值 + delegateTask.setVariable("Liabilityengineer", 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("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/PRFUnderengineerBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java new file mode 100644 index 00000000..e1ca29f5 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFUnderengineerBefore.java @@ -0,0 +1,34 @@ +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 PRFUnderengineerBefore 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("bzqdfbStep3?prcType=14"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java new file mode 100644 index 00000000..82cae47c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java @@ -0,0 +1,79 @@ +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 PRFstartAfter 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("Buttpeoplelist",nextUserList); + +// 赋值 + delegateTask.setVariable("Buttpeople", object.getString("creatUser")); + nextUserList.add(object.getString("creatUser")); + + + //截止时间 流程描述 创建人 + 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/PRFstartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartBefore.java new file mode 100644 index 00000000..f73c5099 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartBefore.java @@ -0,0 +1,20 @@ +package com.ydw.bat.wkflow.listener.ParticipateRevisionFiling; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class PRFstartBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { +// IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); +// QueryWrapper queryWrapper1 = new QueryWrapper(); +// queryWrapper1.isNull("TASK_ID"); +// List list = busBean.list(queryWrapper1); +// if(!list.isEmpty()){ +// BusProcessNew one1 = list.get(0); +// one1.setTaskId(delegateTask.getId()); +// busBean.saveOrUpdate(one1); +// } + } + +} From d432ad8b59ca60315891f7fa75debe6d8f06a9af Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Mon, 25 Oct 2021 15:22:55 +0800 Subject: [PATCH 12/35] =?UTF-8?q?=E6=9D=8E=E5=A5=A5=20=E5=8A=A0=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../JoinStandardFiling/JSFApproveAfter.java | 95 ++++++++++++++++ .../JoinStandardFiling/JSFApproveBefore.java | 34 ++++++ .../JoinStandardFiling/JSFAuditAfter.java | 106 ++++++++++++++++++ .../JoinStandardFiling/JSFAuditBefore.java | 34 ++++++ .../JSFFillinformationAfter.java | 100 +++++++++++++++++ .../JSFFillinformationBefore.java | 34 ++++++ .../JoinStandardFiling/JSFIssuedAfter.java | 4 +- .../JoinStandardFiling/JSFstartAfter.java | 4 +- 8 files changed, 407 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationBefore.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 new file mode 100644 index 00000000..0a272fba --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveAfter.java @@ -0,0 +1,95 @@ +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 org.apache.commons.lang.StringUtils; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Date; +import java.util.List; + +public class JSFApproveAfter 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); + + String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); + + if ("1".equalsIgnoreCase(approvalOpinion)) { + delegateTask.setVariable("Standardizer2", object.getString("Standardizer2User")); + + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busProcessNew.setUserId(object.getString("Standardizer2User")); + busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busBean.save(busProcessNew); + + func1(delegateTask, busBean, object, "1"); + delegateTask.setVariable("bzFlag", 2); + } else { + delegateTask.setVariable("bzFlag", 1); + func2(delegateTask, busBean, object, "0", busProcessNameService); + } + } + + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + if (one2 != null) { + //one2.setPrcName("入库流程结束"); + one2.setOverTime(OVERTIME); + one2.setPrcType("1"); + busProcessNameService.saveOrUpdate(one2); + } + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } +} 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 new file mode 100644 index 00000000..7d29b130 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFApproveBefore.java @@ -0,0 +1,34 @@ +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 JSFApproveBefore 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("bzqdfbStep5?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 new file mode 100644 index 00000000..62ceb391 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditAfter.java @@ -0,0 +1,106 @@ +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +public class JSFAuditAfter 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("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); + if (StringUtils.isNotBlank(object.getString("statuteministerUser"))) { + + if (object.getString("statuteministerUser").contains(",")) { + nextUserList = Arrays.asList(object.getString("statuteministerUser").split(",")); + } else { + nextUserList.add(object.getString("statuteministerUser")); + } + } + } else { + delegateTask.setVariable("gcsFlag", 2); + if (StringUtils.isNotBlank(object.getString("Standardizer2User"))) { + delegateTask.setVariable("Standardizer2", object.getString("Standardizer2User")); + nextUserList.add(object.getString("Standardizer2User")); + } + } + + //截止时间 流程描述 创建人 + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("prcCreateUser", user); + delegateTask.setVariable("prcCreateUserName", username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; + 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); + + 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); + } + } + } +} 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 new file mode 100644 index 00000000..43f2cc14 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFAuditBefore.java @@ -0,0 +1,34 @@ +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 JSFAuditBefore 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("bzqdfbStep4?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 new file mode 100644 index 00000000..947ebfad --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationAfter.java @@ -0,0 +1,100 @@ +package com.ydw.bat.wkflow.listener.JoinStandardFiling; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; +import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; +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.ActivitiException; +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.Arrays; +import java.util.Date; +import java.util.List; + +public class JSFFillinformationAfter 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); + + String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); + + if ("1".equalsIgnoreCase(approvalOpinion)) { + delegateTask.setVariable("statuteengineer", object.getString("statuteengineerUser")); + + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busProcessNew.setUserId(object.getString("statuteengineerUser")); + busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busBean.save(busProcessNew); + + func1(delegateTask, busBean, object, "1"); + delegateTask.setVariable("dlFlag", 1); + } else { + delegateTask.setVariable("dlFlag", 0); + func2(delegateTask, busBean, object, "0", busProcessNameService); + } + } + + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + if (one2 != null) { + //one2.setPrcName("入库流程结束"); + one2.setOverTime(OVERTIME); + one2.setPrcType("1"); + busProcessNameService.saveOrUpdate(one2); + } + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } +} 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 new file mode 100644 index 00000000..29b80451 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFFillinformationBefore.java @@ -0,0 +1,34 @@ +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 JSFFillinformationBefore 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("bzqdfbStep3?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 index 8c60c8b2..0061a8b3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/JoinStandardFiling/JSFIssuedAfter.java @@ -34,10 +34,10 @@ public class JSFIssuedAfter implements TaskListener { List nextUserList = new ArrayList(); // 配置多实例 - delegateTask.setVariable("Standardizerlist",nextUserList); + delegateTask.setVariable("Standardizer2list",nextUserList); // 赋值署名领导 - delegateTask.setVariable("Standardizerlist", object.getString("sonUser")); + delegateTask.setVariable("Standardizer2", object.getString("sonUser")); nextUserList.add(object.getString("sonUser")); 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 e145c81d..02b4cb67 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 @@ -34,9 +34,9 @@ public class JSFstartAfter implements TaskListener { List nextUserList = new ArrayList(); // 配置多实例 - delegateTask.setVariable("Standardizerlist",nextUserList); + delegateTask.setVariable("Standardizer1list",nextUserList); -// 赋值署名领导 +// 赋值 delegateTask.setVariable("Standardizer1", object.getString("creatUser")); nextUserList.add(object.getString("creatUser")); From abc898e14f9cb35b00a2a696e03217b7ec2791a3 Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 25 Oct 2021 15:35:36 +0800 Subject: [PATCH 13/35] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8Bv3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChargeVerifyAfter.java | 64 +++++++++++++------ .../ChargeVerifyBefore.java | 2 +- .../DirectorChooseAfter.java | 46 +++++++++---- .../DirectorChooseBefore.java | 2 +- .../EngineerReviseAfter.java | 3 +- .../EngineerReviseBefore.java | 2 +- .../EngineerReviseDoneAfter.java | 4 +- .../EngineerReviseDoneBefore.java | 2 +- .../Kev.java | 2 +- .../LeaderVerifyAfter.java | 2 +- .../LeaderVerifyBefore.java | 2 +- .../ManageSignAfter.java | 56 +++++++++++----- .../ManageSignBefore.java | 2 +- .../PresidentVerifyAfter.java | 3 +- .../PresidentVerifyBefore.java | 2 +- .../WriteMaterialAfter.java | 4 +- .../WriteMaterialBefore.java | 2 +- .../WriteMemberInfoAfter.java | 3 +- .../WriteMemberInfoBefore.java | 2 +- 19 files changed, 133 insertions(+), 72 deletions(-) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/ChargeVerifyAfter.java (69%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/ChargeVerifyBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/DirectorChooseAfter.java (75%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/DirectorChooseBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/EngineerReviseAfter.java (97%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/EngineerReviseBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/EngineerReviseDoneAfter.java (96%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/EngineerReviseDoneBefore.java (83%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/Kev.java (96%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/LeaderVerifyAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/LeaderVerifyBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/ManageSignAfter.java (70%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/ManageSignBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/PresidentVerifyAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/PresidentVerifyBefore.java (83%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/WriteMaterialAfter.java (97%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/WriteMaterialBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/WriteMemberInfoAfter.java (97%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardApplyMeetProcess => standardApplyMeetProcess}/WriteMemberInfoBefore.java (83%) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java similarity index 69% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ChargeVerifyAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index d1c8827b..d02f1261 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; @@ -11,13 +11,12 @@ 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 io.swagger.models.auth.In; +import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -55,26 +54,49 @@ public class ChargeVerifyAfter implements TaskListener { delegateTask.setVariable("chargePassList", objects); } // 审批 - if("1".equals(object.getString("passFlag"))){//通过 - delegateTask.setVariable("pass2",1);//排他通道 - count = delegateTask.getVariable("chargePassCount",Integer.class); - delegateTask.setVariable("chargePassCount",count + 1); - objects = delegateTask.getVariable("chargePassList",JSONArray.class); - objects.add(object); - delegateTask.setVariable("chargePassList",objects); - System.out.println(delegateTask.getVariable("chargePassList")); - if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); - }//下一节点 + //防止重复审批同一对象 + List idList = new ArrayList<>(); + if(null == delegateTask.getVariable("chargeIdList")){ + delegateTask.setVariable("chargeIdList", idList); + } + int rat = 0; + idList = delegateTask.getVariable("chargeIdList",List.class); + if(!idList.isEmpty()){ + for(String a : idList){ + if(a.equals(object.getString("member"))){ + rat = 1; + break; + } + } + } + if(rat == 0){ + if("1".equals(object.getString("passFlag"))){//通过 + + idList.add(object.getString("member")); + delegateTask.setVariable("chargeIdList",idList); + + delegateTask.setVariable("pass2",1);//排他通道 + count = delegateTask.getVariable("chargePassCount",Integer.class); + delegateTask.setVariable("chargePassCount",count + 1); + objects = delegateTask.getVariable("chargePassList",JSONArray.class); + objects.add(object); + delegateTask.setVariable("chargePassList",objects); + System.out.println(delegateTask.getVariable("chargePassList")); + if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); + }//下一节点 + } + }else{ + delegateTask.setVariable("pass2",0);//排他通道 + if(StringUtils.isNotBlank(object.getString("member"))) { + nextUserList.add(object.getString("member")); + delegateTask.setVariable("member", nextUserList); + }//驳回重写 } }else{ - delegateTask.setVariable("pass2",0);//排他通道 - if(StringUtils.isNotBlank(object.getString("member"))) { - nextUserList.add(object.getString("member")); - delegateTask.setVariable("member", nextUserList); - }//驳回重写 + throw new ActivitiException("审批过了"); } // 存储当前节点意见 if (null != object.getString("commentText")) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ChargeVerifyBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java index fb1345a7..973895b0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ChargeVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java similarity index 75% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/DirectorChooseAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java index 113d28a7..28ac97a7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,12 +10,11 @@ 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.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; -import org.apache.commons.lang.StringUtils; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** @@ -48,16 +47,39 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("memberList", passMemberList); } - if("1".equals(object.getString("passFlag"))) { - nextUserList.add(object.getString("memberId")); - if (null!=delegateTask.getVariable("memberList")) { - List middle=delegateTask.getVariable("memberList",List.class); - middle.addAll(nextUserList); - delegateTask.setVariable("memberList",middle); - }else { - delegateTask.setVariable("memberList",nextUserList); + //防止重复审批同一对象 + List idList = new ArrayList<>(); + if(null == delegateTask.getVariable("memberIdList")){ + delegateTask.setVariable("memberIdList", idList); + } + int rat = 0; + idList = delegateTask.getVariable("memberIdList",List.class); + if(!idList.isEmpty()){ + for(String a : idList){ + if(a.equals(object.getString("member"))){ + rat = 1; + break; + } } - delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); + } + if(rat == 0){ + if("1".equals(object.getString("passFlag"))) { + + idList.add(object.getString("member")); + delegateTask.setVariable("memberIdList",idList); + + nextUserList.add(object.getString("memberId")); + if (null!=delegateTask.getVariable("memberList")) { + List middle=delegateTask.getVariable("memberList",List.class); + middle.addAll(nextUserList); + delegateTask.setVariable("memberList",middle); + }else { + delegateTask.setVariable("memberList",nextUserList); + } + delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); + } + }else{ + throw new ActivitiException("此对象已经审批过了"); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/DirectorChooseBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java index 100ea39a..1d35c523 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/DirectorChooseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java similarity index 97% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index 8e08af6c..6306830a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -15,7 +15,6 @@ import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java index 69e427cf..f4dea6d0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java similarity index 96% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseDoneAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java index ffb6d9da..1a34155c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -12,11 +12,9 @@ import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; -import org.apache.commons.lang.StringUtils; import java.text.SimpleDateFormat; import java.util.ArrayList; -import java.util.Arrays; import java.util.Date; import java.util.List; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java similarity index 83% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseDoneBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java index 00cbe8f6..383bd819 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/EngineerReviseDoneBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/Kev.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java similarity index 96% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/Kev.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java index 2e6df15e..b1d6957b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/Kev.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/Kev.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; /** diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/LeaderVerifyAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index d4d5102d..b93f2208 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/LeaderVerifyBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java index 83570c9a..48074192 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/LeaderVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java similarity index 70% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java index 4bbbe7d5..41deea28 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -10,6 +10,7 @@ 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.ActivitiException; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; @@ -44,25 +45,48 @@ public class ManageSignAfter implements TaskListener { if(null == delegateTask.getVariable("managePassCount")){ delegateTask.setVariable("managePassCount",count); } - //999999999 - if("1".equals(object.getString("passFlag"))) {//通过 - count = delegateTask.getVariable("managePassCount",Integer.class); - count++; - delegateTask.setVariable("managePassCount",count); - if(delegateTask.getVariable("managePassCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ - if(StringUtils.isNotBlank(object.getString("president"))) { - nextUserList.add(object.getString("president")); - delegateTask.setVariable("president", nextUserList); + //防止重复审批同一对象 + List idList = new ArrayList<>(); + if(null == delegateTask.getVariable("manageIdList")){ + delegateTask.setVariable("manageIdList", idList); + } + int rat = 0; + idList = delegateTask.getVariable("manageIdList",List.class); + if(!idList.isEmpty()){ + for(String a : idList){ + if(a.equals(object.getString("manageDepartment"))){ + rat = 1; + break; } - delegateTask.setVariable("pass4",1); } + } + if(rat == 0){ + if("1".equals(object.getString("passFlag"))) {//通过 - }else{ - delegateTask.setVariable("pass4",0); - if(StringUtils.isNotBlank(object.getString("engineerSum"))) { - nextUserList.add(object.getString("engineerSum")); - delegateTask.setVariable("engineerSum", nextUserList); + idList.add(object.getString("manageDepartment")); + delegateTask.setVariable("manageIdList",idList); + + + count = delegateTask.getVariable("managePassCount",Integer.class); + count++; + delegateTask.setVariable("managePassCount",count); + if(delegateTask.getVariable("managePassCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ + if(StringUtils.isNotBlank(object.getString("president"))) { + nextUserList.add(object.getString("president")); + delegateTask.setVariable("president", nextUserList); + } + delegateTask.setVariable("pass4",1); + } + + }else{ + delegateTask.setVariable("pass4",0); + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); + } } + }else{ + throw new ActivitiException("此对象已经审批过了"); } // 存储当前节点意见 if (null != object.getString("commentText")) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java index 347e5320..fef0c7f9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/ManageSignBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/PresidentVerifyAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index c84f9928..06c36152 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -15,7 +15,6 @@ import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java similarity index 83% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/PresidentVerifyBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java index 6d11b5b7..1899822d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/PresidentVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java similarity index 97% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java index bb801f99..7c9d6437 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -14,10 +14,8 @@ 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.Arrays; -import java.util.Date; import java.util.List; /** diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java index 433bd4c9..cc7868e6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMaterialBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java similarity index 97% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMemberInfoAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index a37d5a2d..9ea63399 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; @@ -15,7 +15,6 @@ import org.activiti.engine.delegate.TaskListener; import org.apache.commons.lang.StringUtils; import java.util.ArrayList; -import java.util.Arrays; import java.util.List; /** diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java similarity index 83% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMemberInfoBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java index 3d3939a9..042cab05 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardApplyMeetProcess/WriteMemberInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardApplyMeetProcess; +package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; From 44d3c2186c365cdf5ee871453e88381eedf26387 Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Mon, 25 Oct 2021 15:35:51 +0800 Subject: [PATCH 14/35] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B-=E5=89=AF?= =?UTF-8?q?=E6=80=BB=E7=9B=91=E6=89=B9=E5=87=86=E4=BF=AE=E8=AE=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PRGEInspectorApprovalAfter.java | 2 ++ 1 file changed, 2 insertions(+) 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 535dba62..5295ca4e 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 @@ -54,6 +54,8 @@ public class PRGEInspectorApprovalAfter implements TaskListener { if (StringUtils.isNotBlank(object.getString("revisionInformation"))){ delegateTask.setVariable("revisionInformation", object.getString("revisionInformation")); } + }else{ + delegateTask.setVariable("fgfzj", "2"); } From 80de1a5faf906ca6248cd43a3daa0181329a2426 Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 25 Oct 2021 16:02:37 +0800 Subject: [PATCH 15/35] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8Bv1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChargeVerifyAfter.java | 155 ++++++++++++++++++ .../ChargeVerifyBefore.java | 11 ++ .../DirectorChooseAfter.java | 136 +++++++++++++++ .../DirectorChooseBefore.java | 11 ++ .../EngineerReviseAfter.java | 86 ++++++++++ .../EngineerReviseBefore.java | 11 ++ .../EngineerReviseDoneAfter.java | 89 ++++++++++ .../EngineerReviseDoneBefore.java | 11 ++ .../LeaderVerifyAfter.java | 118 +++++++++++++ .../LeaderVerifyBefore.java | 11 ++ .../ManageSignAfter.java | 141 ++++++++++++++++ .../ManageSignBefore.java | 11 ++ .../PresidentVerifyAfter.java | 110 +++++++++++++ .../PresidentVerifyBefore.java | 11 ++ .../WriteMaterialAfter.java | 98 +++++++++++ .../WriteMaterialBefore.java | 12 ++ .../WriteMemberInfoAfter.java | 91 ++++++++++ .../WriteMemberInfoBefore.java | 11 ++ 18 files changed, 1124 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyAfter.java new file mode 100644 index 00000000..db35a098 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyAfter.java @@ -0,0 +1,155 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +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.ActivitiException; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * chargeVerify - 入会人员所在部门负责人审核 + */ +public class ChargeVerifyAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + List nextUserList = new ArrayList(); + + + + Integer count = 0; + + if(null == delegateTask.getVariable("chargePassCount")){ + delegateTask.setVariable("chargePassCount",count); + } + JSONArray objects = new JSONArray(); + if(null == delegateTask.getVariable("chargePassList")) { + delegateTask.setVariable("chargePassList", objects); + } + // 审批 + //防止重复审批同一对象 + List idList = new ArrayList<>(); + if(null == delegateTask.getVariable("chargeIdList")){ + delegateTask.setVariable("chargeIdList", idList); + } + int rat = 0; + idList = delegateTask.getVariable("chargeIdList",List.class); + if(!idList.isEmpty()){ + for(String a : idList){ + if(a.equals(object.getString("member"))){ + rat = 1; + break; + } + } + } + if(rat == 0){ + if("1".equals(object.getString("passFlag"))){//通过 + + idList.add(object.getString("member")); + delegateTask.setVariable("chargeIdList",idList); + + delegateTask.setVariable("pass2",1);//排他通道 + count = delegateTask.getVariable("chargePassCount",Integer.class); + delegateTask.setVariable("chargePassCount",count + 1); + objects = delegateTask.getVariable("chargePassList",JSONArray.class); + objects.add(object); + delegateTask.setVariable("chargePassList",objects); + System.out.println(delegateTask.getVariable("chargePassList")); + if(delegateTask.getVariable("memberCount", Integer.class).equals(delegateTask.getVariable("chargePassCount", Integer.class))){ + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); + }//下一节点 + } + }else{ + delegateTask.setVariable("pass2",0);//排他通道 + if(StringUtils.isNotBlank(object.getString("member"))) { + nextUserList.add(object.getString("member")); + delegateTask.setVariable("member", nextUserList); + }//驳回重写 + } + }else{ + throw new ActivitiException("审批过了"); + } +// 存储当前节点意见 + 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); + } + } + + + + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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(objects.toJSONString()); +// 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/StandardAfterMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyBefore.java new file mode 100644 index 00000000..ef24fbd7 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class ChargeVerifyBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("ChargeVerifyBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseAfter.java new file mode 100644 index 00000000..24a23e69 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseAfter.java @@ -0,0 +1,136 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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.ActivitiException; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.ArrayList; +import java.util.List; + +/** + * DirectorChoose - 技术委员会分委会主任/入会代表所在中心主任提名入会代表 + */ +public class DirectorChooseAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + System.out.println("后置搭建完成"); + //如果 他是通过 passFlag==1 + List passMemberList = new ArrayList<>(); + if(null == delegateTask.getVariable("memberList")){ + delegateTask.setVariable("memberList", passMemberList); + } + + //防止重复审批同一对象 + List idList = new ArrayList<>(); + if(null == delegateTask.getVariable("memberIdList")){ + delegateTask.setVariable("memberIdList", idList); + } + int rat = 0; + idList = delegateTask.getVariable("memberIdList",List.class); + if(!idList.isEmpty()){ + for(String a : idList){ + if(a.equals(object.getString("member"))){ + rat = 1; + break; + } + } + } + if(rat == 0){ + if("1".equals(object.getString("passFlag"))) { + + idList.add(object.getString("member")); + delegateTask.setVariable("memberIdList",idList); + + nextUserList.add(object.getString("memberId")); + if (null!=delegateTask.getVariable("memberList")) { + List middle=delegateTask.getVariable("memberList",List.class); + middle.addAll(nextUserList); + delegateTask.setVariable("memberList",middle); + }else { + delegateTask.setVariable("memberList",nextUserList); + } + delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); + } + }else{ + throw new ActivitiException("此对象已经审批过了"); + } + + + // 存储当前节点意见 + 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); + } + } + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/StandardAfterMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseBefore.java new file mode 100644 index 00000000..79d9da21 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class DirectorChooseBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("DirectorChooseBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseAfter.java new file mode 100644 index 00000000..45fb90b7 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseAfter.java @@ -0,0 +1,86 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * EngineerRevise - 标准法规工程师汇总修订 + */ +public class EngineerReviseAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + if (StringUtils.isNotBlank(object.getString("leader"))) { + nextUserList.add(object.getString("leader")); + delegateTask.setVariable("leader", nextUserList); + } + + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/StandardAfterMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseBefore.java new file mode 100644 index 00000000..b027ee39 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class EngineerReviseBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("EngineerReviseBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneAfter.java new file mode 100644 index 00000000..c83dc307 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneAfter.java @@ -0,0 +1,89 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +/** + * EngineerReviseDone - 标准法规工程师汇总修订 + */ +public class EngineerReviseDoneAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + + + + + + + //截止时间 流程描述 创建人 + String 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/StandardAfterMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneBefore.java new file mode 100644 index 00000000..5f355c47 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class EngineerReviseDoneBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("EngineerReviseDoneBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyAfter.java new file mode 100644 index 00000000..a8f3b7c7 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyAfter.java @@ -0,0 +1,118 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * LeaderVerify - 标准法规部主管领导审核 + */ +public class LeaderVerifyAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + if("1".equals(object.getString("passFlag"))) {//通过 + delegateTask.setVariable("pass3",1); + if(StringUtils.isNotBlank(object.getString("manageDepartmentList"))) { + + if (object.getString("manageDepartmentList").contains(",")) { + nextUserList = Arrays.asList(object.getString("manageDepartmentList").split(",")); + } else { + nextUserList.add(object.getString("manageDepartmentList")); + } + // 配置多实例 + delegateTask.setVariable("manageDepartmentList", nextUserList); + delegateTask.setVariable("manageDepartmentCount",nextUserList.size()); + + } + }else{ + delegateTask.setVariable("pass3",0); + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); + } + } + // 存储当前节点意见 + 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); + } + } + + + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/StandardAfterMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyBefore.java new file mode 100644 index 00000000..1f013ca5 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class LeaderVerifyBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("LeaderVerifyBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignAfter.java new file mode 100644 index 00000000..a35487f4 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignAfter.java @@ -0,0 +1,141 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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.ActivitiException; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * ManageSign - 费用管理部门会签 + */ +public class ManageSignAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + Integer count = 0; + if(null == delegateTask.getVariable("managePassCount")){ + delegateTask.setVariable("managePassCount",count); + } + //防止重复审批同一对象 + List idList = new ArrayList<>(); + if(null == delegateTask.getVariable("manageIdList")){ + delegateTask.setVariable("manageIdList", idList); + } + int rat = 0; + idList = delegateTask.getVariable("manageIdList",List.class); + if(!idList.isEmpty()){ + for(String a : idList){ + if(a.equals(object.getString("manageDepartment"))){ + rat = 1; + break; + } + } + } + if(rat == 0){ + if("1".equals(object.getString("passFlag"))) {//通过 + + idList.add(object.getString("manageDepartment")); + delegateTask.setVariable("manageIdList",idList); + + + count = delegateTask.getVariable("managePassCount",Integer.class); + count++; + delegateTask.setVariable("managePassCount",count); + if(delegateTask.getVariable("managePassCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ + if(StringUtils.isNotBlank(object.getString("president"))) { + nextUserList.add(object.getString("president")); + delegateTask.setVariable("president", nextUserList); + } + delegateTask.setVariable("pass4",1); + } + + }else{ + delegateTask.setVariable("pass4",0); + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); + } + } + }else{ + throw new ActivitiException("此对象已经审批过了"); + } +// 存储当前节点意见 + 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); + } + } + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/StandardAfterMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignBefore.java new file mode 100644 index 00000000..5eb24162 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class ManageSignBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("ManageSignBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyAfter.java new file mode 100644 index 00000000..ccf7ecb8 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyAfter.java @@ -0,0 +1,110 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * PresidentVerify - 技术委员会常务副主任/总院院长审定 + */ +public class PresidentVerifyAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + // 入会申请信息重新封装 + if("1".equals(object.getString("passFlag"))) {//通过 + delegateTask.setVariable("pass5",1); + if(StringUtils.isNotBlank(object.getString("engineerSumDone"))) { + nextUserList.add(object.getString("engineerSumDone")); + delegateTask.setVariable("engineerSumDone", nextUserList); + } + + }else{ + delegateTask.setVariable("pass5",0); + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { + nextUserList.add(object.getString("engineerSum")); + delegateTask.setVariable("engineerSum", nextUserList); + } + } + // 存储当前节点意见 + 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); + } + } + + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/StandardAfterMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyBefore.java new file mode 100644 index 00000000..aa94c4e0 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class PresidentVerifyBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("PresidentVerifyBefore-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialAfter.java new file mode 100644 index 00000000..78a01b90 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialAfter.java @@ -0,0 +1,98 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +/** + * WriteMasterial - 标准法规工程师填写入会资料 + */ +public class WriteMaterialAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + // 入会申请信息重新封装 + if(StringUtils.isNotBlank(object.getString("directorList"))) { + + if (object.getString("directorList").contains(",")) { + nextUserList = Arrays.asList(object.getString("directorList").split(",")); + } else { + nextUserList.add(object.getString("directorList")); + } + // 配置多实例 + delegateTask.setVariable("directorList", nextUserList); + } + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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());//流程实例Id + busProcessNewNext.setMesg(object.toJSONString());//信息 + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());//节点信息 + busProcessNewNext.setFinishFlag("0");//完成注记 + busProcessNewNext.setTaskInfo(delegateTask.getName());//节点信息 + busProcessNewNext.setUserId(nextUser);//处理人 + busProcessNewNext.setPrcName(prcName);//流程名 + busBean.save(busProcessNewNext); + System.out.println("---------------------user1--------------"); + System.out.println("处理人:" + nextUser); + System.out.println("流程名:" + prcName); + System.out.println("节点信息:" + delegateTask.getName()); + } + } + } + +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialBefore.java new file mode 100644 index 00000000..be28ead6 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialBefore.java @@ -0,0 +1,12 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class WriteMaterialBefore implements TaskListener { + + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("WriteMaterial-前置启动"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoAfter.java new file mode 100644 index 00000000..91296c06 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoAfter.java @@ -0,0 +1,91 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * WriteMemberInfo - 入会代表填写入会信息表 + */ +public class WriteMemberInfoAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + + // + if(StringUtils.isNotBlank(object.getString("charge"))) { + nextUserList.add(object.getString("charge")); + delegateTask.setVariable("charge", nextUserList); + System.out.println(delegateTask.getVariable("charge")); + } + + + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("11"); + 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/StandardAfterMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoBefore.java new file mode 100644 index 00000000..5032010c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class WriteMemberInfoBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + System.out.println("WriteMemberInfoBefore-前置启动"); + } +} From c2ad71d3be7ee51c7ec702b1e86c6c97cb4b2c79 Mon Sep 17 00:00:00 2001 From: Kevin Date: Mon, 25 Oct 2021 16:05:20 +0800 Subject: [PATCH 16/35] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=8C=96=E6=B4=BB?= =?UTF-8?q?=E5=8A=A8=E5=8F=82=E4=BC=9A=E6=B5=81=E7=A8=8Bv1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ChargeVerifyAfter.java | 2 +- .../ChargeVerifyBefore.java | 2 +- .../DirectorChooseAfter.java | 2 +- .../DirectorChooseBefore.java | 2 +- .../EngineerReviseAfter.java | 2 +- .../EngineerReviseBefore.java | 2 +- .../EngineerReviseDoneAfter.java | 2 +- .../EngineerReviseDoneBefore.java | 2 +- .../LeaderVerifyAfter.java | 2 +- .../LeaderVerifyBefore.java | 2 +- .../ManageSignAfter.java | 2 +- .../ManageSignBefore.java | 2 +- .../PresidentVerifyAfter.java | 2 +- .../PresidentVerifyBefore.java | 2 +- .../WriteMaterialAfter.java | 2 +- .../WriteMaterialBefore.java | 2 +- .../WriteMemberInfoAfter.java | 2 +- .../WriteMemberInfoBefore.java | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/ChargeVerifyAfter.java (99%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/ChargeVerifyBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/DirectorChooseAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/DirectorChooseBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/EngineerReviseAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/EngineerReviseBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/EngineerReviseDoneAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/EngineerReviseDoneBefore.java (83%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/LeaderVerifyAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/LeaderVerifyBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/ManageSignAfter.java (99%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/ManageSignBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/PresidentVerifyAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/PresidentVerifyBefore.java (83%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/WriteMaterialAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/WriteMaterialBefore.java (82%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/WriteMemberInfoAfter.java (98%) rename src/main/java/com/ydw/bat/wkflow/listener/{StandardAfterMeetProcess => StandardMeetProcess}/WriteMemberInfoBefore.java (83%) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java similarity index 99% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java index db35a098..be726840 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java index ef24fbd7..816d9331 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ChargeVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java index 24a23e69..44d5db95 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java index 79d9da21..e501d8ac 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorChooseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java index 45fb90b7..c67e715e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java index b027ee39..283cba83 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java index c83dc307..2006c90c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java similarity index 83% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java index 5f355c47..b9d87ceb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/EngineerReviseDoneBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java index a8f3b7c7..e2eb615a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java index 1f013ca5..0930f283 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/LeaderVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java similarity index 99% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java index a35487f4..eff4e925 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java index 5eb24162..b9818f88 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/ManageSignBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java index ccf7ecb8..022e32f1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java similarity index 83% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java index aa94c4e0..b09ae845 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/PresidentVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java index 78a01b90..d37571d9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java similarity index 82% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java index be28ead6..1b5f9158 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMaterialBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java similarity index 98% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java index 91296c06..b31bb674 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java similarity index 83% rename from src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java index 5032010c..10a9c00a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/WriteMemberInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java @@ -1,4 +1,4 @@ -package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; +package com.ydw.bat.wkflow.listener.StandardMeetProcess; import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; From 68857751efd10b6afab5a4cbd73f360b750c11c6 Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Mon, 25 Oct 2021 17:00:50 +0800 Subject: [PATCH 17/35] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MinisterApprovalAfter.java | 120 ++++++++++++++++++ .../MinisterApprovalBefore.java | 11 ++ .../PRGAMStartAfter.java | 109 ++++++++++++++++ .../PRGAMStartBefore.java | 11 ++ .../PresidentApprovalAfter.java | 108 ++++++++++++++++ .../PresidentApprovalBefore.java | 11 ++ .../RevisionInformationAfter.java | 110 ++++++++++++++++ .../RevisionInformationBefore.java | 11 ++ 8 files changed, 491 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java 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 new file mode 100644 index 00000000..152200a8 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java @@ -0,0 +1,120 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +public class MinisterApprovalAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + if("1".equals(object.getString("fgfbz"))){ + delegateTask.setVariable("fgfbz", "1"); + if (StringUtils.isNotBlank(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("revision"))){ + delegateTask.setVariable("revision", object.getString("revision")); + } + }else{ + delegateTask.setVariable("fgfbz", "2"); + } + + //截止时间 流程描述 创建人 +// 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=""; +// 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); + if(one1!=null){ + one1.setPrcType("18"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + 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(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.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 new file mode 100644 index 00000000..3fdc0fa9 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class MinisterApprovalBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} 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 new file mode 100644 index 00000000..dce211d3 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java @@ -0,0 +1,109 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +public class PRGAMStartAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + if(StringUtils.isNotBlank(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"); + delegateTask.setVariable("createUser",user); + String username = object.getString("prcCreateUserName"); + 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 + "-标准法规清单申请-经理审批"; +// } + + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setPrcType("18"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + 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(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.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/PRGAMStartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartBefore.java new file mode 100644 index 00000000..6a3b6b3b --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class PRGAMStartBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} 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 new file mode 100644 index 00000000..39b266e8 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java @@ -0,0 +1,108 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +public class PresidentApprovalAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + if("1".equals(object.getString("gsfz"))){ + delegateTask.setVariable("gsfz", "1"); + }else{ + delegateTask.setVariable("gsfz", "0"); + if (StringUtils.isNotBlank(object.getString("revision"))){ + delegateTask.setVariable("revision", object.getString("revision")); + } + } + + //截止时间 流程描述 创建人 +// String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("prcCreateUser"); + delegateTask.setVariable("createUser",user); + String username = object.getString("prcCreateUserName"); + delegateTask.setVariable("createUserName",username); + String standName = object.getString("listName"); + delegateTask.setVariable("listName",standName); + String prcName=""; + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setPrcType("18"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + 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(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.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/PresidentApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java new file mode 100644 index 00000000..d49c05e3 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class PresidentApprovalBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} 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 new file mode 100644 index 00000000..217c0662 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java @@ -0,0 +1,110 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +public class RevisionInformationAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + if (StringUtils.isNotBlank(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"); + delegateTask.setVariable("createUser",user); + String username = object.getString("prcCreateUserName"); + 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 + "-标准法规清单申请-经理审批"; +// } + + + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setPrcType("18"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + 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(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.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 new file mode 100644 index 00000000..9c79a0ad --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class RevisionInformationBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} From 13bb7a488de6d96bf9aa0955f856a7b80802130c Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Mon, 25 Oct 2021 18:07:01 +0800 Subject: [PATCH 18/35] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E4=BC=9A=E5=90=8E=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApprovalAfter.java | 115 ++++++++++++++++++ .../ApprovalBefore.java | 11 ++ .../InputInformationAfter.java | 109 +++++++++++++++++ .../InputInformationBefore.java | 11 ++ .../PRGAMStartAfter.java | 109 +++++++++++++++++ .../PRGAMStartBefore.java | 11 ++ .../RevisionInformationAfter.java | 109 +++++++++++++++++ .../RevisionInformationBefore.java | 11 ++ 8 files changed, 486 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java 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 new file mode 100644 index 00000000..491bd17d --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalAfter.java @@ -0,0 +1,115 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +public class ApprovalAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + + if("1".equals(object.getString("shyFlag"))){ + delegateTask.setVariable("shyFlag", "1"); + }else{ + delegateTask.setVariable("shyFlag", "0"); + if(StringUtils.isNotBlank(object.getString("revision"))){ + delegateTask.setVariable("revision", object.getString("revision")); + } + } + + //截止时间 流程描述 创建人 +// 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=""; +// 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); + if(one1!=null){ + one1.setPrcType("19"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + 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(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.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/ApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java new file mode 100644 index 00000000..198cd5e2 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/ApprovalBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class ApprovalBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} 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 new file mode 100644 index 00000000..dc24f48a --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationAfter.java @@ -0,0 +1,109 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +public class InputInformationAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + if(StringUtils.isNotBlank(object.getString("approvalId"))){ + delegateTask.setVariable("approval", object.getString("approvalId")); + } + + //截止时间 流程描述 创建人 +// 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=""; +// 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); + if(one1!=null){ + one1.setPrcType("19"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + 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(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.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 new file mode 100644 index 00000000..bcb3db24 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/InputInformationBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class InputInformationBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} 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 new file mode 100644 index 00000000..c2983d43 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartAfter.java @@ -0,0 +1,109 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +public class PRGAMStartAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + if(StringUtils.isNotBlank(object.getString("inputId"))){ + delegateTask.setVariable("inputInformation", object.getString("inputId")); + } + + //截止时间 流程描述 创建人 +// 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=""; +// 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); + if(one1!=null){ + one1.setPrcType("19"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + 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(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.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/PRGAMStartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartBefore.java new file mode 100644 index 00000000..2de7d3e1 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/PRGAMStartBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class PRGAMStartBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} 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 new file mode 100644 index 00000000..7c188187 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationAfter.java @@ -0,0 +1,109 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +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 org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +public class RevisionInformationAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + + List nextUserList = new ArrayList(); + if(StringUtils.isNotBlank(object.getString("revision"))){ + delegateTask.setVariable("approval", object.getString("revision")); + } + + //截止时间 流程描述 创建人 +// 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=""; +// 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); + if(one1!=null){ + one1.setPrcType("19"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + // 存储当前节点意见 + // 存储当前节点意见 + 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(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + }else { + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.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 new file mode 100644 index 00000000..22b82c13 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAfterMeeting/RevisionInformationBefore.java @@ -0,0 +1,11 @@ +package com.ydw.bat.wkflow.listener.policyResearchGroupAfterMeeting; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +public class RevisionInformationBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + } +} From 0fd17b796475aea7e07be3bc872462a582fc21be Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Tue, 26 Oct 2021 10:53:09 +0800 Subject: [PATCH 19/35] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E5=85=A5=E4=BC=9A=E6=B5=81=E7=A8=8B---=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PGREPresidentApprovalAfter.java | 4 ++-- .../PRGEInspectorApprovalAfter.java | 8 ++++---- .../PRGEMinisterConfirmAfter.java | 8 ++++---- .../policyResearchGroupEnrollment/PRGEStartAfter.java | 4 ++-- .../RevisonInformationAfter.java | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) 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 bf2e1e04..328c30fd 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 @@ -48,8 +48,8 @@ public class PGREPresidentApprovalAfter implements TaskListener { delegateTask.setVariable("gsfz", "1"); } else { delegateTask.setVariable("gsfz", "0"); - if (StringUtils.isNotBlank(object.getString("revisionInformation"))) { - delegateTask.setVariable("revisionInformation", object.getString("revisionInformation")); + if (StringUtils.isNotBlank(object.getString("revisionId"))) { + delegateTask.setVariable("revisionInformation", object.getString("revisionId")); } } 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 5295ca4e..4cd6cc8a 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 @@ -46,13 +46,13 @@ public class PRGEInspectorApprovalAfter implements TaskListener { if ("1".equals(object.getString("fgfzj"))) { delegateTask.setVariable("fgfzj", "1"); - if (StringUtils.isNotBlank(object.getString("presidentApproval"))) { - delegateTask.setVariable("presidentApproval", object.getString("presidentApproval")); + if (StringUtils.isNotBlank(object.getString("presidentId"))) { + delegateTask.setVariable("presidentApproval", object.getString("presidentId")); } } else if ("0".equals(object.getString("fgfzj"))) { delegateTask.setVariable("fgfzj", "0"); - if (StringUtils.isNotBlank(object.getString("revisionInformation"))){ - delegateTask.setVariable("revisionInformation", object.getString("revisionInformation")); + if (StringUtils.isNotBlank(object.getString("revisionId"))){ + delegateTask.setVariable("revisionInformation", object.getString("revisionId")); } }else{ delegateTask.setVariable("fgfzj", "2"); 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 34976211..f4569aac 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 @@ -48,13 +48,13 @@ public class PRGEMinisterConfirmAfter implements TaskListener { if("1".equals(object.getString("fgfbz"))){ delegateTask.setVariable("fgfbz", "1"); - if (StringUtils.isNotBlank(object.getString("inspectorApproval"))){ - delegateTask.setVariable("inspectorApproval", object.getString("inspectorApproval")); + if (StringUtils.isNotBlank(object.getString("inspectorId"))){ + delegateTask.setVariable("inspectorApproval", object.getString("inspectorId")); } }else{ delegateTask.setVariable("fgfbz","0"); - if (StringUtils.isNotBlank(object.getString("revisionInformation"))){ - delegateTask.setVariable("revisionInformation", object.getString("revisionInformation")); + if (StringUtils.isNotBlank(object.getString("revisionId"))){ + delegateTask.setVariable("revisionInformation", object.getString("revisionId")); } } 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 25ebb302..d3d527a5 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 @@ -44,8 +44,8 @@ public class PRGEStartAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - if(StringUtils.isNotBlank(object.getString("ministerConfirm"))){ - delegateTask.setVariable("ministerConfirm", object.getString("ministerConfirm")); + if(StringUtils.isNotBlank(object.getString("ministerId"))){ + delegateTask.setVariable("ministerConfirm", object.getString("ministerId")); } //截止时间 流程描述 创建人 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 ed44fbaf..128866a5 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 @@ -44,8 +44,8 @@ public class RevisonInformationAfter implements TaskListener { List nextUserList = new ArrayList(); - if (StringUtils.isNotBlank(object.getString("ministerConfirm"))) { - delegateTask.setVariable("ministerConfirm", object.getString("ministerConfirm")); + if (StringUtils.isNotBlank(object.getString("ministerId"))) { + delegateTask.setVariable("ministerConfirm", object.getString("ministerId")); } From 934cadafad76d5646154cfbc1438dbdc423a95a9 Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 26 Oct 2021 11:02:31 +0800 Subject: [PATCH 20/35] taskFinishV1 --- .../AutoStartAfter.java | 89 ++++++++++++++ .../AutoStartBefore.java | 35 ++++++ .../DirectorVerifyAfter.java | 111 ++++++++++++++++++ .../DirectorVerifyBefore.java | 35 ++++++ .../MemberUploadInfoAfter.java | 90 ++++++++++++++ .../MemberUploadInfoBefore.java | 35 ++++++ .../ChargeVerifyAfter.java | 2 +- .../ChargeVerifyBefore.java | 28 ++++- .../DirectorChooseAfter.java | 13 +- .../DirectorChooseBefore.java | 30 ++++- .../EngineerReviseAfter.java | 2 +- .../EngineerReviseBefore.java | 30 ++++- .../EngineerReviseDoneAfter.java | 3 +- .../EngineerReviseDoneBefore.java | 30 ++++- .../LeaderVerifyAfter.java | 4 +- .../LeaderVerifyBefore.java | 30 ++++- .../StandardMeetProcess/ManageSignAfter.java | 13 +- .../StandardMeetProcess/ManageSignBefore.java | 30 ++++- .../PresidentVerifyAfter.java | 2 +- .../PresidentVerifyBefore.java | 30 ++++- .../WriteMaterialAfter.java | 2 +- .../WriteMaterialBefore.java | 30 ++++- .../WriteMemberInfoAfter.java | 2 +- .../WriteMemberInfoBefore.java | 27 ++++- .../ChargeVerifyBefore.java | 30 ++++- .../DirectorChooseAfter.java | 9 +- .../DirectorChooseBefore.java | 31 ++++- .../EngineerReviseBefore.java | 31 ++++- .../EngineerReviseDoneAfter.java | 2 +- .../EngineerReviseDoneBefore.java | 31 ++++- .../LeaderVerifyBefore.java | 31 ++++- .../ManageSignAfter.java | 11 +- .../ManageSignBefore.java | 31 ++++- .../PresidentVerifyBefore.java | 31 ++++- .../WriteMaterialBefore.java | 31 ++++- .../WriteMemberInfoBefore.java | 31 ++++- 36 files changed, 926 insertions(+), 77 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java new file mode 100644 index 00000000..a8232b8a --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java @@ -0,0 +1,89 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +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.ActivitiException; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * chargeVerify - 入会人员所在部门负责人审核 + */ +public class AutoStartAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + List nextUserList = new ArrayList(); + + if(StringUtils.isNotBlank(object.getString("member"))) { + nextUserList.add(object.getString("member")); + delegateTask.setVariable("member", nextUserList); + } + + + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("13"); + 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.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/StandardAfterMeetProcess/AutoStartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java new file mode 100644 index 00000000..4b178638 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java @@ -0,0 +1,35 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +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 AutoStartBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + String link = "bzqdfbStep2?prcType=13"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java new file mode 100644 index 00000000..aa7042c4 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java @@ -0,0 +1,111 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +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.ActivitiException; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * chargeVerify - 入会人员所在部门负责人审核 + */ +public class DirectorVerifyAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + List nextUserList = new ArrayList(); + + if("1".equals(object.getString("passFlag"))){ + delegateTask.setVariable("pass",1); + //TODO 流程结束 入库操作待写 + }else{ + delegateTask.setVariable("pass",0); + + if(StringUtils.isNotBlank(object.getString("member"))) { + nextUserList.add(object.getString("member")); + delegateTask.setVariable("member", nextUserList); + } + } + +// 存储当前节点意见 + 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); + } + } + + + + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("13"); + 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.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/StandardAfterMeetProcess/DirectorVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java new file mode 100644 index 00000000..fe4d6e86 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java @@ -0,0 +1,35 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +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 DirectorVerifyBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + String link = "bzqdfbStep2?prcType=13"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java new file mode 100644 index 00000000..8e7d5378 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java @@ -0,0 +1,90 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +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.ActivitiException; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import org.apache.commons.lang.StringUtils; + +import java.util.ArrayList; +import java.util.List; + +/** + * chargeVerify - 入会人员所在部门负责人审核 + */ +public class MemberUploadInfoAfter 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); + + LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.class); + + //根据流程id找到流程信息 + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId()); + Datas datas = datasService.getOne(queryWrapper); + + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); + List nextUserList = new ArrayList(); + + + if(StringUtils.isNotBlank(object.getString("director"))) { + nextUserList.add(object.getString("director")); + delegateTask.setVariable("director", nextUserList); + } + + + //截止时间 流程描述 创建人 + 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); + if (one1 != null) { + one1.setPrcType("13"); + 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.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/StandardAfterMeetProcess/MemberUploadInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java new file mode 100644 index 00000000..c65c239c --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java @@ -0,0 +1,35 @@ +package com.ydw.bat.wkflow.listener.StandardAfterMeetProcess; + +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 MemberUploadInfoBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + + String link = "bzqdfbStep2?prcType=13"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java index be726840..d2db1bd5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java @@ -129,7 +129,7 @@ public class ChargeVerifyAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java index 816d9331..f05ca90c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java @@ -1,11 +1,37 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +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 ChargeVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("ChargeVerifyBefore-前置启动"); + + String link = "bzqdfbStep2?prcType=12"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java index 44d5db95..44b46fe9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java @@ -9,6 +9,7 @@ import com.ydw.bat.wkflow.business_main.datas.entity.Datas; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.listener.standardApplyMeetProcess.Kev; import com.ydw.bat.wkflow.util.SpringContextUtil; import org.activiti.engine.ActivitiException; import org.activiti.engine.delegate.DelegateTask; @@ -56,18 +57,18 @@ public class DirectorChooseAfter implements TaskListener { idList = delegateTask.getVariable("memberIdList",List.class); if(!idList.isEmpty()){ for(String a : idList){ - if(a.equals(object.getString("member"))){ + if(a.equals(object.getString("memberId"))){ rat = 1; break; } } } + idList.add(object.getString("memberId")); + delegateTask.setVariable("memberIdList",idList); + if(rat == 0){ if("1".equals(object.getString("passFlag"))) { - idList.add(object.getString("member")); - delegateTask.setVariable("memberIdList",idList); - nextUserList.add(object.getString("memberId")); if (null!=delegateTask.getVariable("memberList")) { List middle=delegateTask.getVariable("memberList",List.class); @@ -77,6 +78,8 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("memberList",nextUserList); } delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); + }else{ + //TODO 如果所有人未通过，则结束流程 } }else{ throw new ActivitiException("此对象已经审批过了"); @@ -111,7 +114,7 @@ public class DirectorChooseAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java index e501d8ac..c8d7e44d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java @@ -1,11 +1,35 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +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 DirectorChooseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("DirectorChooseBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java index c67e715e..f08bb2c5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java @@ -61,7 +61,7 @@ public class EngineerReviseAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java index 283cba83..4ac43fc2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java @@ -1,11 +1,35 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +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 EngineerReviseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("EngineerReviseBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java index 2006c90c..767a5019 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java @@ -43,6 +43,7 @@ public class EngineerReviseDoneAfter implements TaskListener { List nextUserList = new ArrayList(); + //TODO 流程结束，汇总 @@ -64,7 +65,7 @@ public class EngineerReviseDoneAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java index b9d87ceb..39876635 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java @@ -1,11 +1,35 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +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 EngineerReviseDoneBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("EngineerReviseDoneBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java index e2eb615a..1012feb9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java @@ -58,6 +58,8 @@ public class LeaderVerifyAfter implements TaskListener { } }else{ delegateTask.setVariable("pass3",0); + + //若有通过参数重新指定代理人，则更换代理人，否则使用之前节点设定的原有代理人 if(StringUtils.isNotBlank(object.getString("engineerSum"))) { nextUserList.add(object.getString("engineerSum")); delegateTask.setVariable("engineerSum", nextUserList); @@ -93,7 +95,7 @@ public class LeaderVerifyAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java index 0930f283..41e2fd77 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java @@ -1,11 +1,35 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +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 LeaderVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("LeaderVerifyBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java index eff4e925..6372a0c8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java @@ -45,6 +45,7 @@ public class ManageSignAfter implements TaskListener { if(null == delegateTask.getVariable("managePassCount")){ delegateTask.setVariable("managePassCount",count); } + //防止重复审批同一对象 List idList = new ArrayList<>(); if(null == delegateTask.getVariable("manageIdList")){ @@ -60,17 +61,15 @@ public class ManageSignAfter implements TaskListener { } } } + idList.add(object.getString("manageDepartment")); + delegateTask.setVariable("manageIdList",idList); if(rat == 0){ if("1".equals(object.getString("passFlag"))) {//通过 - idList.add(object.getString("manageDepartment")); - delegateTask.setVariable("manageIdList",idList); - - count = delegateTask.getVariable("managePassCount",Integer.class); count++; delegateTask.setVariable("managePassCount",count); - if(delegateTask.getVariable("managePassCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ + if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ if(StringUtils.isNotBlank(object.getString("president"))) { nextUserList.add(object.getString("president")); delegateTask.setVariable("president", nextUserList); @@ -80,6 +79,8 @@ public class ManageSignAfter implements TaskListener { }else{ delegateTask.setVariable("pass4",0); + + delegateTask.removeVariable("manageIdList"); if(StringUtils.isNotBlank(object.getString("engineerSum"))) { nextUserList.add(object.getString("engineerSum")); delegateTask.setVariable("engineerSum", nextUserList); @@ -116,7 +117,7 @@ public class ManageSignAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java index b9818f88..0b28f2de 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java @@ -1,11 +1,35 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +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 ManageSignBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("ManageSignBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java index 022e32f1..eed4002b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java @@ -85,7 +85,7 @@ public class PresidentVerifyAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java index b09ae845..fe9a1b58 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java @@ -1,11 +1,35 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +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 PresidentVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("PresidentVerifyBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java index d37571d9..a8b41cbe 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java @@ -68,7 +68,7 @@ public class WriteMaterialAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java index 1b5f9158..02b43cd3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java @@ -1,12 +1,36 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +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 WriteMaterialBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("WriteMaterial-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java index b31bb674..d1263b6d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java @@ -66,7 +66,7 @@ public class WriteMemberInfoAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("12"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java index 10a9c00a..da8de999 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.StandardMeetProcess; +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 WriteMemberInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("WriteMemberInfoBefore-前置启动"); + + String link = "bzqdfbStep2?prcType=12"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java index 973895b0..6683e926 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java @@ -1,11 +1,35 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +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 ChargeVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("ChargeVerifyBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java index 28ac97a7..9279bc42 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java @@ -56,18 +56,17 @@ public class DirectorChooseAfter implements TaskListener { idList = delegateTask.getVariable("memberIdList",List.class); if(!idList.isEmpty()){ for(String a : idList){ - if(a.equals(object.getString("member"))){ + if(a.equals(object.getString("memberId"))){ rat = 1; break; } } } + idList.add(object.getString("memberId")); + delegateTask.setVariable("memberIdList",idList); if(rat == 0){ if("1".equals(object.getString("passFlag"))) { - idList.add(object.getString("member")); - delegateTask.setVariable("memberIdList",idList); - nextUserList.add(object.getString("memberId")); if (null!=delegateTask.getVariable("memberList")) { List middle=delegateTask.getVariable("memberList",List.class); @@ -77,6 +76,8 @@ public class DirectorChooseAfter implements TaskListener { delegateTask.setVariable("memberList",nextUserList); } delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); + }else{ + //TODO 如果所有人未通过，则结束流程 } }else{ throw new ActivitiException("此对象已经审批过了"); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java index 1d35c523..2db06f83 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +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 DirectorChooseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("DirectorChooseBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java index f4dea6d0..62cfe18a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +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 EngineerReviseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("EngineerReviseBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java index 1a34155c..5eaffa92 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java @@ -44,7 +44,7 @@ public class EngineerReviseDoneAfter implements TaskListener { - + //TODO 流程结束，汇总 diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java index 383bd819..f6686832 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +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 EngineerReviseDoneBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("EngineerReviseDoneBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java index 48074192..7326eddd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +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 LeaderVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("LeaderVerifyBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java index 41deea28..9aeade8c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java @@ -60,17 +60,18 @@ public class ManageSignAfter implements TaskListener { } } } + idList.add(object.getString("manageDepartment")); + delegateTask.setVariable("manageIdList",idList); + + if(rat == 0){ if("1".equals(object.getString("passFlag"))) {//通过 - idList.add(object.getString("manageDepartment")); - delegateTask.setVariable("manageIdList",idList); - count = delegateTask.getVariable("managePassCount",Integer.class); count++; delegateTask.setVariable("managePassCount",count); - if(delegateTask.getVariable("managePassCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ + if(delegateTask.getVariable("manageDepartmentCount", Integer.class).equals(delegateTask.getVariable("managePassCount", Integer.class))){ if(StringUtils.isNotBlank(object.getString("president"))) { nextUserList.add(object.getString("president")); delegateTask.setVariable("president", nextUserList); @@ -80,6 +81,8 @@ public class ManageSignAfter implements TaskListener { }else{ delegateTask.setVariable("pass4",0); + delegateTask.removeVariable("manageIdList"); + if(StringUtils.isNotBlank(object.getString("engineerSum"))) { nextUserList.add(object.getString("engineerSum")); delegateTask.setVariable("engineerSum", nextUserList); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java index fef0c7f9..236bd528 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +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 ManageSignBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("ManageSignBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java index 1899822d..6e21f544 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +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 PresidentVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("PresidentVerifyBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java index cc7868e6..7a309c87 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java @@ -1,12 +1,37 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +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 WriteMaterialBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("WriteMaterial-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java index 042cab05..faff807a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java @@ -1,11 +1,36 @@ package com.ydw.bat.wkflow.listener.standardApplyMeetProcess; +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 WriteMemberInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - System.out.println("WriteMemberInfoBefore-前置启动"); - } -} + + String link = "bzqdfbStep2?prcType=11"; + + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.isNull("TASK_ID"); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + busBean.saveOrUpdate(one1); + + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink(link); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + }} From dfbff2dd250411f43feb3c8d6e919cba7b9057f0 Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Tue, 26 Oct 2021 11:04:48 +0800 Subject: [PATCH 21/35] =?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=BF=AE?= =?UTF-8?q?=E8=AE=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MinisterApprovalAfter.java | 4 ++-- .../PresidentApprovalAfter.java | 4 ++-- 2 files changed, 4 insertions(+), 4 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 152200a8..c0e9c3d0 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 @@ -45,8 +45,8 @@ public class MinisterApprovalAfter implements TaskListener { } }else if ("0".equals(object.getString("fgfbz"))){ delegateTask.setVariable("fgfbz", "0"); - if (StringUtils.isNotBlank(object.getString("revision"))){ - delegateTask.setVariable("revision", object.getString("revision")); + if (StringUtils.isNotBlank(object.getString("revisionId"))){ + delegateTask.setVariable("revision", object.getString("revisionId")); } }else{ delegateTask.setVariable("fgfbz", "2"); 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 39b266e8..0a05ed9e 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 @@ -41,8 +41,8 @@ public class PresidentApprovalAfter implements TaskListener { delegateTask.setVariable("gsfz", "1"); }else{ delegateTask.setVariable("gsfz", "0"); - if (StringUtils.isNotBlank(object.getString("revision"))){ - delegateTask.setVariable("revision", object.getString("revision")); + if (StringUtils.isNotBlank(object.getString("revisionId"))){ + delegateTask.setVariable("revision", object.getString("revisionId")); } } From eb6a7ae89c493f97ecd2b6abd70eaa5c4e49292d Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Tue, 26 Oct 2021 11:15:01 +0800 Subject: [PATCH 22/35] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E4=BC=9A=E5=90=8E=E6=B5=81=E7=A8=8B---=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../policyResearchGroupAfterMeeting/ApprovalAfter.java | 4 ++-- .../policyResearchGroupAfterMeeting/PRGAMStartAfter.java | 4 ++-- .../RevisionInformationAfter.java | 4 ++-- 3 files changed, 6 insertions(+), 6 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 491bd17d..4c60d505 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 @@ -42,8 +42,8 @@ public class ApprovalAfter implements TaskListener { delegateTask.setVariable("shyFlag", "1"); }else{ delegateTask.setVariable("shyFlag", "0"); - if(StringUtils.isNotBlank(object.getString("revision"))){ - delegateTask.setVariable("revision", object.getString("revision")); + if(StringUtils.isNotBlank(object.getString("revisionId"))){ + delegateTask.setVariable("revision", object.getString("revisionId")); } } 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 c2983d43..e3b34cda 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 @@ -37,8 +37,8 @@ public class PRGAMStartAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - if(StringUtils.isNotBlank(object.getString("inputId"))){ - delegateTask.setVariable("inputInformation", object.getString("inputId")); + if(StringUtils.isNotBlank(object.getString("applicantId"))){ + delegateTask.setVariable("inputInformation", object.getString("applicantId")); } //截止时间 流程描述 创建人 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 7c188187..e736e191 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 @@ -37,8 +37,8 @@ public class RevisionInformationAfter implements TaskListener { delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - if(StringUtils.isNotBlank(object.getString("revision"))){ - delegateTask.setVariable("approval", object.getString("revision")); + if(StringUtils.isNotBlank(object.getString("approvalId"))){ + delegateTask.setVariable("approval", object.getString("approvalId")); } //截止时间 流程描述 创建人 From 133b885afa6a11bb0a8f8db2e94fb71f2335f6eb Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Tue, 26 Oct 2021 15:07:28 +0800 Subject: [PATCH 23/35] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PRFApproveAfter.java | 2 +- .../RecommendedApproval/RAApproveAfter.java | 81 ++++++------------- .../RecommendedApproval/RAAuditAfter.java | 22 ++--- .../RAModifyInformationAfter.java | 6 +- .../RAModifyInformationBefore.java | 2 +- .../RecommendedApproval/RASignAfter.java | 24 +++--- .../RAValidationAfter.java | 22 ++--- .../RecommendedApproval/RAstartAfter.java | 6 +- 8 files changed, 66 insertions(+), 99 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java index a9f4b952..ff7b7501 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFApproveAfter.java @@ -73,7 +73,7 @@ public class PRFApproveAfter implements TaskListener { BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); if (one2 != null) { - //one2.setPrcName("入库流程结束"); + one2.setPrcName("入库流程结束"); one2.setOverTime(OVERTIME); one2.setPrcType("1"); busProcessNameService.saveOrUpdate(one2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java index cadc3e26..e3a7a1c1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java @@ -29,23 +29,24 @@ import com.alibaba.fastjson.JSONObject; public class RAApproveAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { + //默认流程数据接口 IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); + //流程节点信息 IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); - LawsUserInfoService lawsUserInfoService = SpringContextUtil.getBean(LawsUserInfoService.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()); + JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson", object); String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); - - if("1".equalsIgnoreCase(approvalOpinion)){ - delegateTask.setVariable("yzFlag",1); - delegateTask.setVariable("applyUserId",object.getString("applyUpdUserId")); + if ("1".equalsIgnoreCase(approvalOpinion)) { + delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); BusProcessNew busProcessNew = new BusProcessNew(); busProcessNew.setMsgType("clause"); busProcessNew.setPId(delegateTask.getProcessInstanceId()); @@ -53,77 +54,45 @@ public class RAApproveAfter implements TaskListener { busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNew.setFinishFlag("0"); busProcessNew.setTaskInfo(delegateTask.getName()); - busProcessNew.setUserId(object.getString("applyUpdUserId")); - busProcessNew.setPrcName(delegateTask.getVariable("listName",String.class)+"-外部署名推荐批准-修改信息"); + busProcessNew.setUserId(object.getString("prcCreateUser")); + busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); busBean.save(busProcessNew); - func1(delegateTask, busBean, object,"1"); - }else { - SarLawsDetailedList lawsDetailedList=lawsUserInfoService.getStandById(object.getString("standId")); - if (null!=lawsDetailedList){ - DetailedUpDto detailed=new DetailedUpDto(); - detailed.setId(object.getString("standId")); - detailed.setApplicationScope(object.getString("applyRegion")); - detailed.setFileIds(object.getString("fileId")); - detailed.setRemark(object.getString("descriptionList")); -// detailed.setInforlist(object.getString("inforlist")); - JSONArray jsonArray = JSONArray.parseArray(object.getString("dataList")); - String info=""; - String putTime=""; - String zccTime=""; - String xcxTime=""; -// for (Object o: jsonArray) { -// JSONObject object1=JSONObject.parseObject(o.toString()); -// info=info+object1.getString("id")+","; -// putTime=putTime+object1.getString("issueTime")+","; -// zccTime=zccTime+object1.getString("ZCCSSRQ")+","; -// xcxTime=xcxTime+object1.getString("XCXSSRQ")+","; -// } -// detailed.setInforlist(info.substring(0,info.length()-1)); -// detailed.setInforlist1(putTime.substring(0,putTime.length()-1)); -// detailed.setInforlist2(zccTime.substring(0,zccTime.length()-1)); -// detailed.setInforlist3(xcxTime.substring(0,xcxTime.length()-1)); -// detailed.setDetailedListState("1"); -// Date date=new Date(); -// SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); -// detailed.setDetailedListVision(simpleDateFormat.format(date)); -// lawsUserInfoService.updateLaws(detailed); - }else { - throw new ActivitiException("清单信息不存在，若多次出现此信息请联系管理员！！！"); - } - delegateTask.setVariable("yzFlag",2); - func2(delegateTask, busBean, object,"0",busProcessNameService); - + func1(delegateTask, busBean, object, "1"); + delegateTask.setVariable("yzFlag", 2); + } else { + delegateTask.setVariable("yzFlag", 1); + func2(delegateTask, busBean, object, "0", busProcessNameService); } - } - private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object,String commitFlag) { + + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("TASK_ID",delegateTask.getId()); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); - if(one1!=null){ + if (one1 != null) { one1.setCommitFlag(commitFlag); one1.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(one1); } } - private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object,String commitFlag ,IBusProcessNameService busProcessNameService) { - + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { QueryWrapper queryWrapper2 = new QueryWrapper(); - queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - if(one2!=null){ + if (one2 != null) { + one2.setPrcName("入库流程结束"); one2.setOverTime(OVERTIME); - one2.setPrcType("16"); + one2.setPrcType("1"); busProcessNameService.saveOrUpdate(one2); } QueryWrapper queryWrapper1 = new QueryWrapper(); - queryWrapper1.eq("TASK_ID",delegateTask.getId()); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); BusProcessNew one1 = busBean.getOne(queryWrapper1); - if(one1!=null){ + if (one1 != null) { one1.setCommitFlag(commitFlag); one1.setCommitText(object.getString("commentText")); busBean.saveOrUpdate(one1); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java index ce7e8048..75578a70 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java @@ -44,28 +44,28 @@ public class RAAuditAfter implements TaskListener { List nextUserList = new ArrayList(); // 赋值 - delegateTask.setVariable("director", object.getString("directUser")); - nextUserList.add(object.getString("directUser")); - delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); + delegateTask.setVariable("director", object.getString("directorUser")); nextUserList.add(object.getString("directorUser")); + delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); + nextUserList.add(object.getString("prcCreateUser")); -// 逻辑判断是否会签 signFlag +// 逻辑判断 signFlag if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("bzFlag", 1); - if (StringUtils.isNotBlank(object.getString("directUser"))) { + if (StringUtils.isNotBlank(object.getString("directorUser"))) { - if (object.getString("directUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("directUser").split(",")); + if (object.getString("directorUser").contains(",")) { + nextUserList = Arrays.asList(object.getString("directorUser").split(",")); } else { - nextUserList.add(object.getString("directUser")); + nextUserList.add(object.getString("directorUser")); } } } else { delegateTask.setVariable("bzFlag", 2); - if (StringUtils.isNotBlank(object.getString("directorUser"))) { - delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); - nextUserList.add(object.getString("directorUser")); + if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) { + delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); + nextUserList.add(object.getString("prcCreateUser")); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java index e5ac6093..72420410 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java @@ -43,9 +43,9 @@ public class RAModifyInformationAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); -// 赋值署名领导 - delegateTask.setVariable("leadership", object.getString("creatUser")); - nextUserList.add(object.getString("creatUser")); +// 赋值 + delegateTask.setVariable("leadership", object.getString("dockUser")); + nextUserList.add(object.getString("dockUser")); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationBefore.java index 038b799a..74ec459e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationBefore.java @@ -26,7 +26,7 @@ public class RAModifyInformationBefore implements TaskListener{ CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("bzqdfbStep6?prcType=16"); + one1.setLink("bzqdfbStep1?prcType=16"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java index 1683321c..f725c571 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java @@ -44,28 +44,26 @@ public class RASignAfter implements TaskListener { List nextUserList = new ArrayList(); // 赋值 - delegateTask.setVariable("statuteminister", object.getString("dockUser")); - nextUserList.add(object.getString("dockUser")); - delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); - nextUserList.add(object.getString("directorUser")); - -// 逻辑判断是否会签 signFlag + delegateTask.setVariable("statuteminister", object.getString("ministerUser")); + nextUserList.add(object.getString("ministerUser")); + delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); + nextUserList.add(object.getString("prcCreateUser")); if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("ldFlag", 1); - if (StringUtils.isNotBlank(object.getString("dockUser"))) { + if (StringUtils.isNotBlank(object.getString("ministerUser"))) { - if (object.getString("dockUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("dockUser").split(",")); + if (object.getString("ministerUser").contains(",")) { + nextUserList = Arrays.asList(object.getString("ministerUser").split(",")); } else { - nextUserList.add(object.getString("dockUser")); + nextUserList.add(object.getString("ministerUser")); } } } else { delegateTask.setVariable("ldFlag", 2); - if (StringUtils.isNotBlank(object.getString("directorUser"))) { - delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); - nextUserList.add(object.getString("directorUser")); + if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) { + delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); + nextUserList.add(object.getString("prcCreateUser")); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java index 4760c412..afa5b5e5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java @@ -45,29 +45,29 @@ public class RAValidationAfter implements TaskListener { List nextUserList = new ArrayList(); // 赋值 - delegateTask.setVariable("dean", object.getString("deanUser")); - nextUserList.add(object.getString("deanUser")); - delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); - nextUserList.add(object.getString("directorUser")); + delegateTask.setVariable("dean", object.getString("president")); + nextUserList.add(object.getString("president")); + delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); + nextUserList.add(object.getString("prcCreateUser")); // 逻辑判断是否审核 signFlag if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("zrFlag", 1); - if (StringUtils.isNotBlank(object.getString("deanUser"))) { + if (StringUtils.isNotBlank(object.getString("president"))) { - if (object.getString("deanUser").contains(",")) { - nextUserList = Arrays.asList(object.getString("deanUser").split(",")); + if (object.getString("president").contains(",")) { + nextUserList = Arrays.asList(object.getString("president").split(",")); } else { - nextUserList.add(object.getString("deanUser")); + nextUserList.add(object.getString("president")); } } } else { delegateTask.setVariable("zrFlag", 2); - if (StringUtils.isNotBlank(object.getString("directorUser"))) { - delegateTask.setVariable("statuteengineer2", object.getString("directorUser")); - nextUserList.add(object.getString("directorUser")); + if (StringUtils.isNotBlank(object.getString("prcCreateUser"))) { + delegateTask.setVariable("statuteengineer2", object.getString("prcCreateUser")); + nextUserList.add(object.getString("prcCreateUser")); } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java index 44a23a4b..ad69ddd7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java @@ -46,9 +46,9 @@ public class RAstartAfter implements TaskListener { // 配置多实例 delegateTask.setVariable("leadershiplist",nextUserList); -// 赋值署名领导 - delegateTask.setVariable("leadership", object.getString("creatUser")); - nextUserList.add(object.getString("creatUser")); +// 赋值 + delegateTask.setVariable("leadership", object.getString("dockUser")); + nextUserList.add(object.getString("dockUser")); //截止时间 流程描述 创建人 From 839c0a583a1fca5b5e8700a7bc8ca8550974b4fb Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 26 Oct 2021 15:34:59 +0800 Subject: [PATCH 24/35] taskFinishV1.1 --- .../listener/StandardAfterMeetProcess/AutoStartAfter.java | 2 +- .../listener/StandardAfterMeetProcess/DirectorVerifyAfter.java | 2 +- .../StandardAfterMeetProcess/MemberUploadInfoAfter.java | 2 +- .../wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java | 2 +- .../listener/StandardMeetProcess/DirectorChooseAfter.java | 2 +- .../listener/StandardMeetProcess/EngineerReviseAfter.java | 2 +- .../listener/StandardMeetProcess/EngineerReviseDoneAfter.java | 2 +- .../wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java | 2 +- .../wkflow/listener/StandardMeetProcess/ManageSignAfter.java | 2 +- .../listener/StandardMeetProcess/PresidentVerifyAfter.java | 2 +- .../wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java | 2 +- .../listener/StandardMeetProcess/WriteMemberInfoAfter.java | 2 +- .../listener/standardApplyMeetProcess/ChargeVerifyAfter.java | 2 +- .../listener/standardApplyMeetProcess/DirectorChooseAfter.java | 2 +- .../listener/standardApplyMeetProcess/EngineerReviseAfter.java | 2 +- .../standardApplyMeetProcess/EngineerReviseDoneAfter.java | 2 +- .../listener/standardApplyMeetProcess/LeaderVerifyAfter.java | 2 +- .../listener/standardApplyMeetProcess/ManageSignAfter.java | 2 +- .../listener/standardApplyMeetProcess/PresidentVerifyAfter.java | 2 +- .../listener/standardApplyMeetProcess/WriteMaterialAfter.java | 2 +- .../listener/standardApplyMeetProcess/WriteMemberInfoAfter.java | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java index a8232b8a..0655e898 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java @@ -57,7 +57,7 @@ public class AutoStartAfter implements TaskListener { 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/StandardAfterMeetProcess/DirectorVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java index aa7042c4..fed5fd74 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java @@ -79,7 +79,7 @@ public class DirectorVerifyAfter implements TaskListener { 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/StandardAfterMeetProcess/MemberUploadInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java index 8e7d5378..dd712558 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java @@ -58,7 +58,7 @@ public class MemberUploadInfoAfter implements TaskListener { 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/StandardMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java index d2db1bd5..75056281 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java @@ -123,7 +123,7 @@ public class ChargeVerifyAfter implements TaskListener { 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/StandardMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java index 44b46fe9..fcd60803 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java @@ -108,7 +108,7 @@ public class DirectorChooseAfter implements TaskListener { 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/StandardMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java index f08bb2c5..5a91bf21 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java @@ -55,7 +55,7 @@ public class EngineerReviseAfter implements TaskListener { 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/StandardMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java index 767a5019..41073980 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java @@ -59,7 +59,7 @@ public class EngineerReviseDoneAfter implements TaskListener { 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/StandardMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java index 1012feb9..21603df5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java @@ -89,7 +89,7 @@ public class LeaderVerifyAfter implements TaskListener { 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/StandardMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java index 6372a0c8..f3d82079 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java @@ -111,7 +111,7 @@ public class ManageSignAfter implements TaskListener { 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/StandardMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java index eed4002b..68fdf0b7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java @@ -79,7 +79,7 @@ public class PresidentVerifyAfter implements TaskListener { 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/StandardMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java index a8b41cbe..1a0b4457 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java @@ -62,7 +62,7 @@ public class WriteMaterialAfter implements TaskListener { 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/StandardMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java index d1263b6d..6a8bae4e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java @@ -60,7 +60,7 @@ public class WriteMemberInfoAfter implements TaskListener { 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/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index d02f1261..9cf2e1b0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java @@ -123,7 +123,7 @@ public class ChargeVerifyAfter implements TaskListener { 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/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java index 9279bc42..3493715a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java @@ -106,7 +106,7 @@ public class DirectorChooseAfter implements TaskListener { 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/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index 6306830a..a6bfd98a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java @@ -55,7 +55,7 @@ public class EngineerReviseAfter implements TaskListener { 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/standardApplyMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java index 5eaffa92..e93a5516 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java @@ -58,7 +58,7 @@ public class EngineerReviseDoneAfter implements TaskListener { 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/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index b93f2208..f754159e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java @@ -87,7 +87,7 @@ public class LeaderVerifyAfter implements TaskListener { 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/standardApplyMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java index 9aeade8c..ae958a02 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java @@ -113,7 +113,7 @@ public class ManageSignAfter implements TaskListener { 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/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index 06c36152..e34c9c0a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java @@ -79,7 +79,7 @@ public class PresidentVerifyAfter implements TaskListener { 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/standardApplyMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java index 7c9d6437..aba20560 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java @@ -62,7 +62,7 @@ public class WriteMaterialAfter implements TaskListener { 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/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index 9ea63399..53d2138e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java @@ -60,7 +60,7 @@ public class WriteMemberInfoAfter implements TaskListener { delegateTask.setVariable("listName", standName); String prcName = ""; - prcName = standName + "-标准化活动申请入会流程-挑选入会代表"; + prcName = standName + "-标准化活动入会流程-"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); From bb2fab136862f300069041d11f3165b1b77dfd66 Mon Sep 17 00:00:00 2001 From: Kevin Date: Tue, 26 Oct 2021 17:07:42 +0800 Subject: [PATCH 25/35] taskFinishV1.2 --- .../listener/StandardAfterMeetProcess/AutoStartAfter.java | 2 +- .../listener/StandardAfterMeetProcess/AutoStartBefore.java | 2 +- .../listener/StandardAfterMeetProcess/DirectorVerifyAfter.java | 2 +- .../listener/StandardAfterMeetProcess/DirectorVerifyBefore.java | 2 +- .../StandardAfterMeetProcess/MemberUploadInfoAfter.java | 2 +- .../StandardAfterMeetProcess/MemberUploadInfoBefore.java | 2 +- .../wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java | 2 +- .../wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java | 2 +- .../listener/StandardMeetProcess/DirectorChooseAfter.java | 2 +- .../listener/StandardMeetProcess/DirectorChooseBefore.java | 2 +- .../listener/StandardMeetProcess/EngineerReviseAfter.java | 2 +- .../listener/StandardMeetProcess/EngineerReviseBefore.java | 2 +- .../listener/StandardMeetProcess/EngineerReviseDoneAfter.java | 2 +- .../listener/StandardMeetProcess/EngineerReviseDoneBefore.java | 2 +- .../wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java | 2 +- .../wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java | 2 +- .../wkflow/listener/StandardMeetProcess/ManageSignAfter.java | 2 +- .../wkflow/listener/StandardMeetProcess/ManageSignBefore.java | 2 +- .../listener/StandardMeetProcess/PresidentVerifyAfter.java | 2 +- .../listener/StandardMeetProcess/PresidentVerifyBefore.java | 2 +- .../wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java | 2 +- .../listener/StandardMeetProcess/WriteMaterialBefore.java | 2 +- .../listener/StandardMeetProcess/WriteMemberInfoAfter.java | 2 +- .../listener/StandardMeetProcess/WriteMemberInfoBefore.java | 2 +- .../listener/standardApplyMeetProcess/ChargeVerifyAfter.java | 2 +- .../listener/standardApplyMeetProcess/ChargeVerifyBefore.java | 2 +- .../listener/standardApplyMeetProcess/DirectorChooseAfter.java | 2 +- .../listener/standardApplyMeetProcess/DirectorChooseBefore.java | 2 +- .../listener/standardApplyMeetProcess/EngineerReviseAfter.java | 2 +- .../listener/standardApplyMeetProcess/EngineerReviseBefore.java | 2 +- .../standardApplyMeetProcess/EngineerReviseDoneAfter.java | 2 +- .../standardApplyMeetProcess/EngineerReviseDoneBefore.java | 2 +- .../listener/standardApplyMeetProcess/LeaderVerifyAfter.java | 2 +- .../listener/standardApplyMeetProcess/LeaderVerifyBefore.java | 2 +- .../listener/standardApplyMeetProcess/ManageSignAfter.java | 2 +- .../listener/standardApplyMeetProcess/ManageSignBefore.java | 2 +- .../listener/standardApplyMeetProcess/PresidentVerifyAfter.java | 2 +- .../standardApplyMeetProcess/PresidentVerifyBefore.java | 2 +- .../listener/standardApplyMeetProcess/WriteMaterialAfter.java | 2 +- .../listener/standardApplyMeetProcess/WriteMaterialBefore.java | 2 +- .../listener/standardApplyMeetProcess/WriteMemberInfoAfter.java | 2 +- .../standardApplyMeetProcess/WriteMemberInfoBefore.java | 2 +- .../bat/wkflow/listener/standardLibrary/SLApplicantAfter.java | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java index 0655e898..cd4735f4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartAfter.java @@ -63,7 +63,7 @@ public class AutoStartAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("13"); + one1.setPrcType("22"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java index 4b178638..2584f77b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/AutoStartBefore.java @@ -14,7 +14,7 @@ public class AutoStartBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=13"; + String link = "bzqdfbStep2?prcType=22"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java index fed5fd74..cbe96e50 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyAfter.java @@ -85,7 +85,7 @@ public class DirectorVerifyAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("13"); + one1.setPrcType("22"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java index fe4d6e86..f70ca5ab 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/DirectorVerifyBefore.java @@ -14,7 +14,7 @@ public class DirectorVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=13"; + String link = "bzqdfbStep2?prcType=22"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java index dd712558..bd5ba54e 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoAfter.java @@ -64,7 +64,7 @@ public class MemberUploadInfoAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("13"); + one1.setPrcType("22"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java index c65c239c..f883cb31 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardAfterMeetProcess/MemberUploadInfoBefore.java @@ -14,7 +14,7 @@ public class MemberUploadInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=13"; + String link = "bzqdfbStep2?prcType=22"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java index 75056281..ff78244b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyAfter.java @@ -129,7 +129,7 @@ prcName = standName + "-标准化活动参会流程-"; queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("12"); + one1.setPrcType("21"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java index f05ca90c..45c4e771 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ChargeVerifyBefore.java @@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=12"; + String link = "bzqdfbStep2?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java index fcd60803..a05e2a4a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseAfter.java @@ -114,7 +114,7 @@ public class DirectorChooseAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("12"); + one1.setPrcType("21"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java index c8d7e44d..ccad914f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/DirectorChooseBefore.java @@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=12"; + String link = "bzqdfbStep2?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java index 5a91bf21..f92f0fc3 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseAfter.java @@ -61,7 +61,7 @@ public class EngineerReviseAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("12"); + one1.setPrcType("21"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java index 4ac43fc2..a1403a34 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseBefore.java @@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=12"; + String link = "bzqdfbStep2?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java index 41073980..98b03e9d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneAfter.java @@ -65,7 +65,7 @@ public class EngineerReviseDoneAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("12"); + one1.setPrcType("21"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java index 39876635..f054da16 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/EngineerReviseDoneBefore.java @@ -14,7 +14,7 @@ public class EngineerReviseDoneBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=12"; + String link = "bzqdfbStep2?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java index 21603df5..4d747b85 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyAfter.java @@ -95,7 +95,7 @@ public class LeaderVerifyAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("12"); + one1.setPrcType("21"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java index 41e2fd77..d3f917f6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/LeaderVerifyBefore.java @@ -14,7 +14,7 @@ public class LeaderVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=12"; + String link = "bzqdfbStep2?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java index f3d82079..7111ccaa 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignAfter.java @@ -117,7 +117,7 @@ public class ManageSignAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("12"); + one1.setPrcType("21"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java index 0b28f2de..c33e641a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/ManageSignBefore.java @@ -14,7 +14,7 @@ public class ManageSignBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=12"; + String link = "bzqdfbStep2?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java index 68fdf0b7..040a9152 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyAfter.java @@ -85,7 +85,7 @@ public class PresidentVerifyAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("12"); + one1.setPrcType("21"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java index fe9a1b58..8bad174b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/PresidentVerifyBefore.java @@ -14,7 +14,7 @@ public class PresidentVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=12"; + String link = "bzqdfbStep2?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java index 1a0b4457..501b8f0b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialAfter.java @@ -68,7 +68,7 @@ public class WriteMaterialAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("12"); + one1.setPrcType("21"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java index 02b43cd3..54d2f747 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMaterialBefore.java @@ -15,7 +15,7 @@ public class WriteMaterialBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=12"; + String link = "bzqdfbStep2?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java index 6a8bae4e..5210a0e0 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoAfter.java @@ -66,7 +66,7 @@ public class WriteMemberInfoAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("12"); + one1.setPrcType("21"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java index da8de999..3c0d550d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardMeetProcess/WriteMemberInfoBefore.java @@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=12"; + String link = "bzqdfbStep2?prcType=21"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java index 9cf2e1b0..39efddf1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyAfter.java @@ -129,7 +129,7 @@ prcName = standName + "-标准化活动入会流程-"; queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("20"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java index 6683e926..0d99b15d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ChargeVerifyBefore.java @@ -14,7 +14,7 @@ public class ChargeVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=11"; + String link = "bzqdfbStep2?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java index 3493715a..ce55aeaf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseAfter.java @@ -112,7 +112,7 @@ public class DirectorChooseAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("20"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java index 2db06f83..3c7d007b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/DirectorChooseBefore.java @@ -14,7 +14,7 @@ public class DirectorChooseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=11"; + String link = "bzqdfbStep2?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java index a6bfd98a..25572801 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseAfter.java @@ -61,7 +61,7 @@ public class EngineerReviseAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("20"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java index 62cfe18a..49c75d79 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseBefore.java @@ -14,7 +14,7 @@ public class EngineerReviseBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=11"; + String link = "bzqdfbStep2?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java index e93a5516..26d0728d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneAfter.java @@ -64,7 +64,7 @@ public class EngineerReviseDoneAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("20"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java index f6686832..33316a1c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/EngineerReviseDoneBefore.java @@ -14,7 +14,7 @@ public class EngineerReviseDoneBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=11"; + String link = "bzqdfbStep2?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java index f754159e..6aa2397a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyAfter.java @@ -93,7 +93,7 @@ public class LeaderVerifyAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("20"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java index 7326eddd..9c7a538f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/LeaderVerifyBefore.java @@ -14,7 +14,7 @@ public class LeaderVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=11"; + String link = "bzqdfbStep2?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java index ae958a02..2197858c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignAfter.java @@ -119,7 +119,7 @@ public class ManageSignAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("20"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java index 236bd528..cb2b82f2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/ManageSignBefore.java @@ -14,7 +14,7 @@ public class ManageSignBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=11"; + String link = "bzqdfbStep2?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java index e34c9c0a..811aeb38 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyAfter.java @@ -85,7 +85,7 @@ public class PresidentVerifyAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("20"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java index 6e21f544..4154637d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/PresidentVerifyBefore.java @@ -14,7 +14,7 @@ public class PresidentVerifyBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=11"; + String link = "bzqdfbStep2?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java index aba20560..cbea2bde 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialAfter.java @@ -68,7 +68,7 @@ public class WriteMaterialAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("20"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java index 7a309c87..243ce174 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMaterialBefore.java @@ -15,7 +15,7 @@ public class WriteMaterialBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=11"; + String link = "bzqdfbStep2?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java index 53d2138e..52de2fc8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoAfter.java @@ -66,7 +66,7 @@ public class WriteMemberInfoAfter implements TaskListener { queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("11"); + one1.setPrcType("20"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java index faff807a..1e119e94 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardApplyMeetProcess/WriteMemberInfoBefore.java @@ -14,7 +14,7 @@ public class WriteMemberInfoBefore implements TaskListener { @Override public void notify(DelegateTask delegateTask) { - String link = "bzqdfbStep2?prcType=11"; + String link = "bzqdfbStep2?prcType=20"; IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); QueryWrapper queryWrapper1 = new QueryWrapper(); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java index 1a92707a..49ded443 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java @@ -24,7 +24,7 @@ import java.util.List; /** * 标准入库申请人发起后 */ -public class SLApplicantAfter implements TaskListener{ +public class prcName = standName + "-标准化活动参会流程-"; implements TaskListener{ @Override public void notify(DelegateTask delegateTask) { From e7ccce85e8a64b7f54fb4099518afde77af9c14b Mon Sep 17 00:00:00 2001 From: liao <2948196353@qq.com> Date: Tue, 26 Oct 2021 17:17:12 +0800 Subject: [PATCH 26/35] =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/JoinStandardFiling/JSFstartAfter.java | 14 ++++++++------ .../PRFReviewdockAfter.java | 4 +--- .../ParticipateRevisionFiling/PRFstartAfter.java | 12 +++++++----- 3 files changed, 16 insertions(+), 14 deletions(-) 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 02b4cb67..e09f3f74 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 @@ -13,6 +13,7 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class JSFstartAfter implements TaskListener { @@ -33,22 +34,23 @@ public class JSFstartAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); + String ids=object.getString("dockUser"); + if(ids.contains(",")){ + nextUserList=new ArrayList<>(Arrays.asList(ids.split(","))); + }else { + nextUserList.add(ids); + } // 配置多实例 delegateTask.setVariable("Standardizer1list",nextUserList); -// 赋值 - delegateTask.setVariable("Standardizer1", object.getString("creatUser")); - nextUserList.add(object.getString("creatUser")); - //截止时间 流程描述 创建人 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 = "加入标准化协会信息备案-备案任务发起"; - String prcName = delegateTask.getVariable("listName", String.class) + "-加入标准化协会信息备案-备案任务发起"; QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java index d1e2a44d..650a95d9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFReviewdockAfter.java @@ -36,13 +36,11 @@ public class PRFReviewdockAfter implements TaskListener { List nextUserList = new ArrayList(); // 赋值 - delegateTask.setVariable("statuteengineer", object.getString("statuteengineerUser")); + delegateTask.setVariable("statuteengineer", object.getString("statuteengi6neerUser")); nextUserList.add(object.getString("statuteengineerUser")); delegateTask.setVariable("Liabilityengineer", object.getString("LiabilityengineerUser")); nextUserList.add(object.getString("LiabilityengineerUser")); -// 逻辑判断是否会签 signFlag - if(object.getString("signFlag").equals("1")) { delegateTask.setVariable("djrFlag", 1); if (StringUtils.isNotBlank(object.getString("statuteengineerUser"))) { diff --git a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java index 82cae47c..6e0aefe4 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/ParticipateRevisionFiling/PRFstartAfter.java @@ -13,6 +13,7 @@ import org.activiti.engine.delegate.DelegateTask; import org.activiti.engine.delegate.TaskListener; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; public class PRFstartAfter implements TaskListener { @@ -33,14 +34,15 @@ public class PRFstartAfter implements TaskListener { delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); + String ids=object.getString("creatUser"); + if(ids.contains(",")){ + nextUserList=new ArrayList<>(Arrays.asList(ids.split(","))); + }else { + nextUserList.add(ids); + } // 配置多实例 delegateTask.setVariable("Buttpeoplelist",nextUserList); -// 赋值 - delegateTask.setVariable("Buttpeople", object.getString("creatUser")); - nextUserList.add(object.getString("creatUser")); - - //截止时间 流程描述 创建人 String user = object.getString("prcCreateUser"); String username = object.getString("prcCreateUserName"); From 2e5a731625118bf02468c2676e4904dcf125ae26 Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Wed, 27 Oct 2021 09:11:18 +0800 Subject: [PATCH 27/35] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E5=85=A5=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 --- .../PGREPresidentApprovalAfter.java | 64 +++++-------- .../PGREPresidentApprovalBefore.java | 2 +- .../PRGEInspectorApprovalAfter.java | 96 ++++++------------- .../PRGEInspectorApprovalBefore.java | 16 ++++ .../PRGEMinisterConfirmAfter.java | 53 +++++----- .../PRGEMinisterConfirmBefore.java | 40 ++++---- .../PRGEStartAfter.java | 47 +++------ .../RevisionInformationBefore.java | 2 +- .../RevisonInformationAfter.java | 49 +++------- 9 files changed, 140 insertions(+), 229 deletions(-) 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 328c30fd..6f61ba6c 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 @@ -50,36 +50,10 @@ public class PGREPresidentApprovalAfter implements TaskListener { delegateTask.setVariable("gsfz", "0"); if (StringUtils.isNotBlank(object.getString("revisionId"))) { delegateTask.setVariable("revisionInformation", object.getString("revisionId")); + nextUserList.add(object.getString("revisionId")); } } - - - //截止时间 流程描述 创建人 - 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 = ""; -// 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); - if (one1 != null) { - one1.setPrcType("17"); - one1.setPrcName(prcName); - one1.setCreatUser(user); - one1.setCreatUserName(username); - busProcessNameService.saveOrUpdate(one1); - } - // 存储当前节点意见 - // 存储当前节点意见 + // 存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -92,6 +66,30 @@ public class PGREPresidentApprovalAfter implements TaskListener { busBean.saveOrUpdate(busProcessNews); } } + + + + 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); + if (one1 != null) { + one1.setPrcType("17"); + 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(); @@ -105,16 +103,6 @@ public class PGREPresidentApprovalAfter 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/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PGREPresidentApprovalBefore.java index ebce7963..3c56c0cb 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=4"); + one1.setLink("bzqdfbStep3?prcType=17"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } 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 4cd6cc8a..d9628c82 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 @@ -48,75 +48,19 @@ public class PRGEInspectorApprovalAfter implements TaskListener { delegateTask.setVariable("fgfzj", "1"); if (StringUtils.isNotBlank(object.getString("presidentId"))) { delegateTask.setVariable("presidentApproval", object.getString("presidentId")); + nextUserList.add(object.getString("presidentId")); } } else if ("0".equals(object.getString("fgfzj"))) { delegateTask.setVariable("fgfzj", "0"); if (StringUtils.isNotBlank(object.getString("revisionId"))){ delegateTask.setVariable("revisionInformation", object.getString("revisionId")); + } }else{ delegateTask.setVariable("fgfzj", "2"); } - -// if(object.getString("signFlag").equals("1")){ -// delegateTask.setVariable("hqFlag",1); -// -// if(StringUtils.isNotBlank(object.getString("dockUser"))){ -// -// if(object.getString("dockUser").contains(",")){ -// nextUserList = Arrays.asList(object.getString("dockUser").split(",")); -// }else { -// nextUserList.add(object.getString("dockUser")); -// } -// // 配置多实例 -// delegateTask.setVariable("hqUserList",nextUserList); -// } -// }else { -// delegateTask.setVariable("hqFlag",2); -// if(StringUtils.isNotBlank(object.getString("directorUser"))){ -// delegateTask.setVariable("managerUserId",object.getString("directorUser")); -// nextUserList.add(object.getString("directorUser")); -// } -// } -// -// //设置审批中的状态 -// SarLawsDetailedList lawsDetailedList=lawsUserInfoService.getStandById(object.getString("standId")); -// if (null!=lawsDetailedList){ -// DetailedUpDto detailed=new DetailedUpDto(); -// detailed.setId(object.getString("standId")); -// detailed.setDetailedListState("3"); -// lawsUserInfoService.updateLaws(detailed); -// }else { -// throw new ActivitiException("清单信息不存在，若多次出现此信息请联系管理员！！！"); -// } -// - //截止时间 流程描述 创建人 - 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 = ""; -// 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); - if (one1 != null) { - one1.setPrcType("17"); - one1.setPrcName(prcName); - one1.setCreatUser(user); - one1.setCreatUserName(username); - busProcessNameService.saveOrUpdate(one1); - } - // 存储当前节点意见 - // 存储当前节点意见 + // 存储当前节点意见 if (null != object.getString("commentText")) { QueryWrapper queryWrapper3 = new QueryWrapper(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); @@ -129,6 +73,30 @@ public class PRGEInspectorApprovalAfter implements TaskListener { busBean.saveOrUpdate(busProcessNews); } } + + + + 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); + if (one1 != null) { + one1.setPrcType("17"); + 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(); @@ -142,16 +110,6 @@ public class PRGEInspectorApprovalAfter 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/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEInspectorApprovalBefore.java index f30b831e..204823aa 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 @@ -13,6 +13,22 @@ import java.util.List; public class PRGEInspectorApprovalBefore 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("policyResearchGroupEnrollment3?prcType=17"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } } } 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 f4569aac..78e56a7c 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 @@ -50,14 +50,32 @@ public class PRGEMinisterConfirmAfter implements TaskListener { delegateTask.setVariable("fgfbz", "1"); if (StringUtils.isNotBlank(object.getString("inspectorId"))){ delegateTask.setVariable("inspectorApproval", object.getString("inspectorId")); + nextUserList.add(object.getString("inspectorId")); } }else{ delegateTask.setVariable("fgfbz","0"); if (StringUtils.isNotBlank(object.getString("revisionId"))){ delegateTask.setVariable("revisionInformation", object.getString("revisionId")); + nextUserList.add(object.getString("revisionId")); } } + // 存储当前节点意见 + 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); + } + } + + + //截止时间 流程描述 创建人 @@ -69,32 +87,21 @@ public class PRGEMinisterConfirmAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName",standName); String prcName=""; + prcName = standName + "-标准化活动入会流程-副总监批准"; + QueryWrapper queryWrapper2 = new QueryWrapper(); - queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); - if(one1!=null){ + if (one1 != null) { one1.setPrcType("17"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - // 存储当前节点意见 - // 存储当前节点意见 - 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){ + + if (nextUserList != null && !nextUserList.isEmpty()) { + for (String nextUser : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -106,16 +113,6 @@ public class PRGEMinisterConfirmAfter 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/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEMinisterConfirmBefore.java index de85db55..4d19b060 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 @@ -11,28 +11,28 @@ import org.activiti.engine.delegate.TaskListener; import java.util.List; public class PRGEMinisterConfirmBefore implements TaskListener { - @Override - public void notify(DelegateTask delegateTask) { - - } // @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=17"); -// one1.setTaskInfo(delegateTask.getName()); -// oaService.sendTodoMq(one1); -// } // } + @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=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 d3d527a5..b4fbeece 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 @@ -46,50 +46,35 @@ public class PRGEStartAfter implements TaskListener { List nextUserList = new ArrayList(); if(StringUtils.isNotBlank(object.getString("ministerId"))){ delegateTask.setVariable("ministerConfirm", object.getString("ministerId")); + nextUserList.add(object.getString("ministerId")); } + + //截止时间 流程描述 创建人 // 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=""; -// if(object.getString("signFlag").equals("1")) { -// prcName = standName + "-标准法规清单申请-会签"; -// }else { -// prcName = standName + "-标准法规清单申请-经理审批"; -// } - + prcName = standName + "-标准化活动入会流程-副部长审核"; QueryWrapper queryWrapper2 = new QueryWrapper(); - queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); - if(one1!=null){ + if (one1 != null) { one1.setPrcType("17"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - // 存储当前节点意见 - // 存储当前节点意见 - 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){ + + if (!nextUserList.isEmpty()) { + for (String nextUser : nextUserList) { BusProcessNew busProcessNewNext = new BusProcessNew(); busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); @@ -101,16 +86,6 @@ public class PRGEStartAfter 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/policyResearchGroupEnrollment/RevisionInformationBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/RevisionInformationBefore.java index e0761781..5b8fb276 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=4"); + one1.setLink("bzqdfbStep3?prcType=17"); one1.setTaskInfo(delegateTask.getName()); oaService.sendTodoMq(one1); } 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 128866a5..abc0a966 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 @@ -45,24 +45,21 @@ public class RevisonInformationAfter implements TaskListener { List nextUserList = new ArrayList(); if (StringUtils.isNotBlank(object.getString("ministerId"))) { - delegateTask.setVariable("ministerConfirm", object.getString("ministerId")); + nextUserList.add(object.getString("ministerId")); + delegateTask.setVariable("ministerConfirm", nextUserList); +// 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); + delegateTask.setVariable("createUser",user); String username = object.getString("prcCreateUserName"); - delegateTask.setVariable("createUserName", username); + 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 + "-标准法规清单申请-经理审批"; -// } + delegateTask.setVariable("listName",standName); + String prcName=""; + prcName = standName + "-政策课题组入会流程-"; + QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); @@ -73,20 +70,7 @@ public class RevisonInformationAfter implements TaskListener { one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - // 存储当前节点意见 - // 存储当前节点意见 - 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(); @@ -100,16 +84,9 @@ public class RevisonInformationAfter 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); } + + + } } From 1436a42e9d510c9edc0bd2341b042f2ce1ff7284 Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Wed, 27 Oct 2021 09:14:14 +0800 Subject: [PATCH 28/35] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E5=85=A5=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 --- .../bat/wkflow/listener/standardLibrary/SLApplicantAfter.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java index 49ded443..1a92707a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantAfter.java @@ -24,7 +24,7 @@ import java.util.List; /** * 标准入库申请人发起后 */ -public class prcName = standName + "-标准化活动参会流程-"; implements TaskListener{ +public class SLApplicantAfter implements TaskListener{ @Override public void notify(DelegateTask delegateTask) { From 17197f2c38072604d453df4bde9f94d781a7aeec Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 27 Oct 2021 09:21:10 +0800 Subject: [PATCH 29/35] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=90=88=E8=A7=84?= =?UTF-8?q?=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=EF=BC=81=EF=BC=81=EF=BC=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business_auth/LawsUserInfoService.java | 2 +- .../controller/BusProcessNewController.java | 8 ++++ .../datas/mapper/BusProcessNewMapper.java | 2 + .../datas/service/IBusProcessNewService.java | 2 + .../impl/BusProcessNewServiceImpl.java | 5 +++ .../RecommendedApproval/RAApproveAfter.java | 39 ++++++++----------- .../RecommendedApproval/RAAuditAfter.java | 9 ----- .../RAModifyInformationAfter.java | 11 ------ .../RecommendedApproval/RASignAfter.java | 9 ----- .../RAValidationAfter.java | 9 ----- .../RecommendedApproval/RAstartAfter.java | 14 +------ .../PRGEStartAfter.java | 2 +- src/main/resources/application.yml | 2 +- .../mapper/datas/BusProcessNewMapper.xml | 11 ++++++ 14 files changed, 48 insertions(+), 77 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java index 4223c428..07a67b75 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_auth/LawsUserInfoService.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.Set; @Component -@FeignClient(value = "FotonLAWSSystemLeo",path="/api",url="") +@FeignClient(value = "FotonLAWSSystem",path="/api",url="") @RequestMapping("/") public interface LawsUserInfoService { diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java index 44064b20..e589fd93 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/controller/BusProcessNewController.java @@ -47,5 +47,13 @@ public class BusProcessNewController extends BaseAction { return findtodotask; } + @ApiOperation(value = "每天十点需要启动 政策课题后续流程") + @GetMapping("/everyDayTenOlock") + public List everyDayTenOlock() { + List findtodotask = iBusProcessNewService.everyDayTenOlock(); + return findtodotask; + } + + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java index 986f222f..250e500a 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/mapper/BusProcessNewMapper.java @@ -28,4 +28,6 @@ public interface BusProcessNewMapper extends BaseMapper { List findLastworkPeople(@Param("key")String key,@Param("pId")String pId); + List everyDayTenOlock(); + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java index a078b9c2..c699cf84 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/IBusProcessNewService.java @@ -32,4 +32,6 @@ public interface IBusProcessNewService extends IService { //子流程 获取 阶段数据 专用 BY yzh List findLastworkPeople(@Param("key")String key, @Param("pId")String pId); + List everyDayTenOlock(); + } diff --git a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java index 448756e1..85e6da57 100644 --- a/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java +++ b/src/main/java/com/ydw/bat/wkflow/business_main/datas/service/impl/BusProcessNewServiceImpl.java @@ -73,4 +73,9 @@ public class BusProcessNewServiceImpl extends ServiceImpl findLastworkPeople(String key, String pId) { return baseMapper.findLastworkPeople(key,pId); } + + @Override + public List everyDayTenOlock() { + return baseMapper.everyDayTenOlock(); + } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java index e3a7a1c1..ba7910f6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAApproveAfter.java @@ -2,29 +2,22 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; - import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; - import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; - import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; - import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; - 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.ActivitiException; - 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.Arrays; - import java.util.Date; - import java.util.List; - import java.util.regex.Matcher; - import java.util.regex.Pattern; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; +import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; +import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; +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.ActivitiException; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; +import java.text.SimpleDateFormat; +import java.util.Date; public class RAApproveAfter implements TaskListener { @Override diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java index 75578a70..24ddab89 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAAuditAfter.java @@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; -import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; -import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -12,18 +9,12 @@ 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.ActivitiException; 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.Arrays; -import java.util.Date; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class RAAuditAfter implements TaskListener { @Override diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java index 72420410..2d79823b 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java @@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; -import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; -import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -12,18 +9,10 @@ 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.ActivitiException; 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.Arrays; -import java.util.Date; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class RAModifyInformationAfter implements TaskListener { @Override diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java index f725c571..6c2403c9 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RASignAfter.java @@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; -import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; -import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -12,18 +9,12 @@ 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.ActivitiException; 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.Arrays; -import java.util.Date; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class RASignAfter implements TaskListener { @Override diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java index afa5b5e5..122e8e0a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAValidationAfter.java @@ -1,11 +1,7 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval; -import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; -import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; -import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; 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; @@ -13,18 +9,13 @@ 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.ActivitiException; 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.Arrays; -import java.util.Date; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; public class RAValidationAfter implements TaskListener { @Override diff --git a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java index ad69ddd7..56d0bb54 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAstartAfter.java @@ -2,9 +2,6 @@ package com.ydw.bat.wkflow.listener.RecommendedApproval; import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; -import com.ydw.bat.wkflow.business_auth.LawsUserInfoService; -import com.ydw.bat.wkflow.business_main.datas.dto.DetailedUpDto; -import com.ydw.bat.wkflow.business_main.datas.dto.SarLawsDetailedList; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; import com.ydw.bat.wkflow.business_main.datas.entity.Datas; @@ -12,19 +9,11 @@ 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.ActivitiException; 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.Arrays; -import java.util.Date; import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - +//外部署名推荐批准 public class RAstartAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { @@ -56,7 +45,6 @@ public class RAstartAfter implements TaskListener { 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(); 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..15766599 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 @@ -22,7 +22,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.List; - +//政策课题组入会 public class PRGEStartAfter implements TaskListener { @Override public void notify(DelegateTask delegateTask) { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 59aa9518..e0d2bdf9 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -18,7 +18,7 @@ eureka: defaultZone: http://62.234.136.153:8761/eureka/ spring: application: - name: bat-wkflow-leo + name: bat-wkflow http: encoding: charset: UTF-8 diff --git a/src/main/resources/mapper/datas/BusProcessNewMapper.xml b/src/main/resources/mapper/datas/BusProcessNewMapper.xml index 7bb28260..a49542f8 100644 --- a/src/main/resources/mapper/datas/BusProcessNewMapper.xml +++ b/src/main/resources/mapper/datas/BusProcessNewMapper.xml @@ -33,4 +33,15 @@ LEFT JOIN act_hi_taskinst aht ON bpn.TASK_ID = aht.ID_ WHERE bpn.P_ID = #{pId} and aht.TASK_DEF_KEY_ = #{key} + + + From 2a41b35d76caf8f82831daac298e7c720bba92c4 Mon Sep 17 00:00:00 2001 From: koweiyi <274210Kwy> Date: Wed, 27 Oct 2021 11:19:32 +0800 Subject: [PATCH 30/35] =?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 31/35] =?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 32/35] =?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 33/35] =?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); } From dd52ea79a91194d39bef8ea37425c9496740d16b Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Fri, 29 Oct 2021 14:06:49 +0800 Subject: [PATCH 34/35] =?UTF-8?q?=E6=94=BF=E7=AD=96=E8=AF=BE=E9=A2=98?= =?UTF-8?q?=E7=BB=84=E5=85=A5=E4=BC=9A=20&=20=E5=8F=82=E4=BC=9A=20&=20?= =?UTF-8?q?=E4=BC=9A=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 = '政策课题组参会流程-流程结束' From 7ec7c38399630f9b189cf4c15dd329644ad82175 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Sun, 31 Oct 2021 18:20:40 +0800 Subject: [PATCH 35/35] feat: There is no way the,LAWS --- .../lawsLibrary/LLApplicantAfter.java | 126 ++++++++++++++++++ .../lawsLibrary/LLApplicantBefore.java | 26 ++++ .../lawsLibrary/LawsManagerApproveAfter.java | 90 +++++++++++++ .../lawsLibrary/LawsManagerApproveBefore.java | 38 ++++++ 4 files changed, 280 insertions(+) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantAfter.java new file mode 100644 index 00000000..958944e8 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantAfter.java @@ -0,0 +1,126 @@ +package com.ydw.bat.wkflow.listener.lawsLibrary; + +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.ActivitiException; +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.Arrays; +import java.util.Date; +import java.util.List; + +/** + * 政策入库申请人发起后 + */ +public class LLApplicantAfter 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(); + + // 逻辑判断是否会签 signFlag +// JSONObject array = object.getJSONObject("hqsqForm"); + +// if(object.getString("signFlag").equals("1")){ +// delegateTask.setVariable("hqFlag",1); +// +// if(StringUtils.isNotBlank(object.getString("zrUserId"))){ +// +// if(object.getString("zrUserId").contains(",")){ +// nextUserList = Arrays.asList(object.getString("zrUserId").split(",")); +// }else { +// nextUserList.add(object.getString("zrUserId")); +// } +// // 配置多实例 +// delegateTask.setVariable("hqUserList",nextUserList); +// delegateTask.addCandidateUsers(nextUserList); +// }else { +// throw new ActivitiException("1#2会签状态不存在,请配置相关状态"); +// } +// }else { +// delegateTask.setVariable("hqFlag",2); +// +// } + + if(StringUtils.isNotBlank(object.getString("jlUserId"))){ + delegateTask.setVariable("managerUserId",object.getString("jlUserId")); + nextUserList.add(object.getString("jlUserId")); + }else { + throw new ActivitiException("1#2经理人不存在,请配置相关人员"); + } + + + + //截止时间 流程描述 创建人 + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("prcCreateUser"); + String username = object.getString("prcCreateUserName"); +// object.getString("standName") + String standName = ""; + String prcName = "政策入库流程"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ +// one1.setOverTime(OVERTIME); + one1.setPrcType("laws1"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busBean.save(busProcessNew); + + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + busProcessNewNext.setPrcName(prcName); + busBean.save(busProcessNewNext); + } + } + } + + private String verifyObj(String str){ + return (str == null || str.equals("")) ? "" : str; + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantBefore.java new file mode 100644 index 00000000..b3a8cab3 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LLApplicantBefore.java @@ -0,0 +1,26 @@ +package com.ydw.bat.wkflow.listener.lawsLibrary; + +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +/** + * 政策入库申请人发起前 + */ +public class LLApplicantBefore implements TaskListener{ + @Override + public void notify(DelegateTask delegateTask) { + +// IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); +// QueryWrapper queryWrapper1 = new QueryWrapper(); +// queryWrapper1.isNull("TASK_ID"); +// List list = busBean.list(queryWrapper1); +// if(!list.isEmpty()){ +// BusProcessNew one1 = list.get(0); +// one1.setTaskId(delegateTask.getId()); +// busBean.saveOrUpdate(one1); +// } +// + +// WkFlowSendEmail.sendEmailTodo(delegateTask,"会前申请流程"); + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveAfter.java new file mode 100644 index 00000000..1da03b91 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveAfter.java @@ -0,0 +1,90 @@ +package com.ydw.bat.wkflow.listener.lawsLibrary; + +import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName; +import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew; +import com.ydw.bat.wkflow.business_main.datas.entity.Datas; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService; +import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService; +import com.ydw.bat.wkflow.business_main.datas.service.IDatasService; +import com.ydw.bat.wkflow.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * 经理人审批后 + */ +public class LawsManagerApproveAfter 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()); + + String approvalOpinion = object.get("approvalOpinion") == null ? "" : object.get("approvalOpinion").toString(); + + if ("1".equalsIgnoreCase(approvalOpinion)) { + delegateTask.setVariable("applyUserId", object.getString("applyUpdUserId")); + + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + busProcessNew.setUserId(object.getString("applyUpdUserId")); + busProcessNew.setPrcName(delegateTask.getVariable("prcs",String.class)); + busBean.save(busProcessNew); + + func1(delegateTask, busBean, object, "1"); + delegateTask.setVariable("jlFlag", 1); + } else { + delegateTask.setVariable("jlFlag", 0); + func2(delegateTask, busBean, object, "0", busProcessNameService); + } + } + + private void func1(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag) { + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } + + private void func2(DelegateTask delegateTask, IBusProcessNewService busBean, JSONObject object, String commitFlag, IBusProcessNameService busProcessNameService) { + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); + BusProcessName one2 = busProcessNameService.getOne(queryWrapper2); + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + if (one2 != null) { + //one2.setPrcName("入库流程结束"); + one2.setOverTime(OVERTIME); + one2.setPrcType("1"); + busProcessNameService.saveOrUpdate(one2); + } + + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.eq("TASK_ID", delegateTask.getId()); + BusProcessNew one1 = busBean.getOne(queryWrapper1); + if (one1 != null) { + one1.setCommitFlag(commitFlag); + one1.setCommitText(object.getString("commentText")); + busBean.saveOrUpdate(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveBefore.java new file mode 100644 index 00000000..d019a55a --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/lawsLibrary/LawsManagerApproveBefore.java @@ -0,0 +1,38 @@ +package com.ydw.bat.wkflow.listener.lawsLibrary; + +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 LawsManagerApproveBefore implements TaskListener{ + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.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()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzrkStep2?prcType=1"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); + } + } +}