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 497bdb7c..cc37bcab 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 @@ -1,30 +1,25 @@ package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment; -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.business_slrs.dao.WgDept; 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) { @@ -34,8 +29,6 @@ public class PGREPresidentApprovalAfter 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()); @@ -43,58 +36,30 @@ public class PGREPresidentApprovalAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - String user = delegateTask.getVariable("createUser", String.class); - String username = delegateTask.getVariable("createUserName", String.class); - String prcName=""; + String user = delegateTask.getVariable("applyUserId", String.class); + String username = delegateTask.getVariable("applyUserName", String.class); + String topicName = delegateTask.getVariable("topicName", String.class); + String prcName= topicName + "-政策课题入会流程"; - - - List nextUserList = new ArrayList(); + List nextUserList = new ArrayList<>(); if ("1".equals(object.getString("gsfz"))) { + // 批准通过 delegateTask.setVariable("gsfz", "1"); - -// JSONArray jsonArray=JSONArray.parseArray(object.getString("itemList")); -// List wgDept=new ArrayList<>(); -// jsonArray.forEach(o -> { -// JSONObject os=JSONObject.parseObject(o.toString()); -// WgDept wgDept1=new WgDept(); -// wgDept1.setWgId(object.getString("standId")); -// wgDept1.setDeptOrder(os.getString("itemsNum")); -// wgDept1.setDeptPeopleId(os.getString("itemsName")); -// wgDept1.setIdentity(os.getString("responsibleUnitShow")); -// wgDept1.setJoinfile(os.getString("zxUserIdName")); -// wgDept1.setJoinId(os.getString("itermsConditions")); -// wgDept.add(wgDept1); -// }); -// -// JSONArray jsonArray1=JSONArray.parseArray(delegateTask.getVariable("itemListOld",String.class)); -// jsonArray1.forEach(obj ->{ -// JSONObject object1 = JSONObject.parseObject(obj.toString()); -// WgDept wgDept1=new WgDept(); -// wgDept1.setWgId(object.getString("standId")); -// wgDept1.setDeptOrder(object1.getString("itemsNum")); -// wgDept1.setDeptPeopleId(object1.getString("itemsName")); -// wgDept1.setIdentity(object1.getString("responsibleUnitShow")); -// wgDept1.setJoinfile(object1.getString("zxUserIdName")); -// wgDept1.setJoinId(object1.getString("itermsConditions")); -// wgDept.add(wgDept1); -// }); - -// lawsUserInfoService.wgDeptSaveBatch(wgDept); - - prcName = "政策课题组入会流程"; } else { + // 批准驳回 delegateTask.setVariable("gsfz", "0"); - if (StringUtils.isNotBlank(object.getString("revisionId"))) { - delegateTask.setVariable("revisionInformation", object.getString("revisionId")); - nextUserList.add(object.getString("revisionId")); + if (StringUtils.isNotBlank(object.getString("applyUserId"))) { + delegateTask.setVariable("applyUserId", object.getString("applyUserId")); + nextUserList.add(object.getString("applyUserId")); + } else { + throw new ActivitiException("1#2起草人不存在,请配置相关人员"); } - prcName = "政策课题组入会流程-修订入会信息"; +// prcName = "政策课题组入会流程-修订入会信息"; } - // 存储当前节点意见 + // 存储当前节点意见 if (null != object.getString("commentText")) { - QueryWrapper queryWrapper3 = new QueryWrapper(); + QueryWrapper queryWrapper3 = new QueryWrapper<>(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); List list = busBean.list(queryWrapper3); @@ -106,25 +71,24 @@ public class PGREPresidentApprovalAfter implements TaskListener { } } - - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("17"); + one1.setPrcType("30"); // one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - if (nextUserList != null && !nextUserList.isEmpty()) { + if (!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.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(nextUser); 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 ec16dc22..f313a077 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 @@ -10,11 +10,14 @@ 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(); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); queryWrapper1.isNull("TASK_ID"); @@ -26,7 +29,7 @@ public class PGREPresidentApprovalBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("zcrhStep4?prcType=17"); + one1.setLink("policyTopicEnrollment/step4?prcType=30"); 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 2c7a5249..809d9d96 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 @@ -2,9 +2,6 @@ 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; @@ -17,12 +14,12 @@ 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) { @@ -32,8 +29,6 @@ public class PRGEInspectorApprovalAfter 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()); @@ -42,33 +37,42 @@ public class PRGEInspectorApprovalAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - String user = delegateTask.getVariable("createUser", String.class); - String username = delegateTask.getVariable("createUserName", String.class); - String prcName=""; - List nextUserList = new ArrayList(); + String user = delegateTask.getVariable("applyUserId", String.class); + String username = delegateTask.getVariable("applyUserName", String.class); + String topicName = delegateTask.getVariable("topicName", String.class); + String prcName= topicName + "-政策课题入会流程"; + List nextUserList = new ArrayList<>(); if ("1".equals(object.getString("fgfzj"))) { + // 审定通过 delegateTask.setVariable("fgfzj", "1"); if (StringUtils.isNotBlank(object.getString("presidentId"))) { - delegateTask.setVariable("presidentApproval", object.getString("presidentId")); + delegateTask.setVariable("presidentId", object.getString("presidentId")); nextUserList.add(object.getString("presidentId")); + } else { + throw new ActivitiException("1#2公司副总不存在,请配置相关人员"); } - 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")); + if (StringUtils.isNotBlank(object.getString("applyUserId"))){ + delegateTask.setVariable("applyUserId", object.getString("applyUserId")); + nextUserList.add(object.getString("applyUserId")); + } else { + throw new ActivitiException("1#2起草人不存在,请配置相关人员"); } - prcName = "政策课题组入会流程-修订入会信息"; + // 删除其他该节点的代办数据 +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.eq(BusProcessNew::getTaskId, delegateTask.getId()); +// busBean.remove(wrapper); }else{ delegateTask.setVariable("fgfzj", "2"); prcName = "政策课题组入会流程"; } - // 存储当前节点意见 + // 存储当前节点意见 if (null != object.getString("commentText")) { - QueryWrapper queryWrapper3 = new QueryWrapper(); + QueryWrapper queryWrapper3 = new QueryWrapper<>(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); List list = busBean.list(queryWrapper3); @@ -80,27 +84,24 @@ public class PRGEInspectorApprovalAfter implements TaskListener { } } - - - - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("17"); + one1.setPrcType("30"); // one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - if (nextUserList != null && !nextUserList.isEmpty()) { + if (!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.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(nextUser); 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 9842c401..f2ccce56 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 @@ -10,11 +10,15 @@ import org.activiti.engine.delegate.TaskListener; 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(); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); queryWrapper1.isNull("TASK_ID"); @@ -26,7 +30,7 @@ public class PRGEInspectorApprovalBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("zcrhStep3?prcType=17"); + one1.setLink("policyTopicParticipation/step3?prcType=30"); 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 ac5df7e1..91e32899 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 @@ -1,10 +1,8 @@ package com.ydw.bat.wkflow.listener.policyResearchGroupEnrollment; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; 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; @@ -17,12 +15,13 @@ 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) { @@ -33,8 +32,6 @@ public class PRGEMinisterConfirmAfter 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()); @@ -43,33 +40,39 @@ public class PRGEMinisterConfirmAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); //截止时间 流程描述 创建人 - String user = delegateTask.getVariable("createUser",String.class); - String username = delegateTask.getVariable("createUserName",String.class); - String prcName=""; - - - List nextUserList = new ArrayList(); + String user = delegateTask.getVariable("applyUserId",String.class); + String username = delegateTask.getVariable("applyUserName",String.class); + String topicName = delegateTask.getVariable("topicName", String.class); + String prcName= topicName + "-政策课题组入会流程"; + List nextUserList = new ArrayList<>(); if("1".equals(object.getString("fgfbz"))){ + // 审核通过 delegateTask.setVariable("fgfbz", "1"); if (StringUtils.isNotBlank(object.getString("inspectorId"))){ - delegateTask.setVariable("inspectorApproval", object.getString("inspectorId")); - nextUserList.add(object.getString("inspectorId")); + List inspectorIdList = Arrays.asList(object.getString("inspectorId").split(",")); + delegateTask.setVariable("inspectorIdList",inspectorIdList); + nextUserList.addAll(inspectorIdList); + } else { + throw new ActivitiException("1#2法规认证部副总监不存在,请配置相关人员"); } - prcName = "政策课题组入会流程-法规认证部副总监批准"; }else{ + // 审核驳回 delegateTask.setVariable("fgfbz","0"); - if (StringUtils.isNotBlank(object.getString("revisionId"))){ - delegateTask.setVariable("revisionInformation", object.getString("revisionId")); - nextUserList.add(object.getString("revisionId")); + if (StringUtils.isNotBlank(object.getString("applyUserId"))){ + delegateTask.setVariable("applyUserId", object.getString("applyUserId")); + nextUserList.add(object.getString("applyUserId")); } - prcName = "政策课题组入会流程-修订入会信息"; + // 删除其他该节点的代办数据 +// LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); +// wrapper.eq(BusProcessNew::getTaskId, delegateTask.getId()); +// busBean.remove(wrapper); } - // 存储当前节点意见 + // 存储当前节点意见 if (null != object.getString("commentText")) { - QueryWrapper queryWrapper3 = new QueryWrapper(); + QueryWrapper queryWrapper3 = new QueryWrapper<>(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); List list = busBean.list(queryWrapper3); @@ -81,30 +84,24 @@ public class PRGEMinisterConfirmAfter implements TaskListener { } } - - - - - - - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("17"); + one1.setPrcType("30"); // one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); busProcessNameService.saveOrUpdate(one1); } - if (nextUserList != null && !nextUserList.isEmpty()) { + if (!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.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(nextUser); 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 ed466925..5bd6a864 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 @@ -10,15 +10,15 @@ 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(); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); queryWrapper1.isNull("TASK_ID"); @@ -30,7 +30,7 @@ public class PRGEMinisterConfirmBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("zcrhStep2?prcType=17"); + one1.setLink("policyTopicEnrollment/step2?prcType=30"); 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 8c768d1d..c73ee896 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 @@ -2,9 +2,6 @@ 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; @@ -17,12 +14,13 @@ 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) { @@ -33,8 +31,6 @@ public class PRGEStartAfter 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()); @@ -43,27 +39,29 @@ public class PRGEStartAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson",object); - List nextUserList = new ArrayList(); + List nextUserList = new ArrayList<>(); if(StringUtils.isNotBlank(object.getString("ministerId"))){ - delegateTask.setVariable("ministerConfirm", object.getString("ministerId")); - nextUserList.add(object.getString("ministerId")); + List ministerIdList = Arrays.asList(object.getString("ministerId").split(",")); + delegateTask.setVariable("ministerIdList",ministerIdList); + nextUserList.addAll(ministerIdList); +// delegateTask.setVariable("ministerConfirm", object.getString("ministerId")); +// nextUserList.add(object.getString("ministerId")); + } else { + throw new ActivitiException("1#2法规认证部部长不存在,请配置相关人员"); } - - //截止时间 流程描述 创建人 - String user = object.getString("revisionId"); - delegateTask.setVariable("createUser",user); - String username = object.getString("revisionIdName"); - delegateTask.setVariable("createUserName",username); + String user = object.getString("applyUserId"); + String username = object.getString("applyUserName"); + String topicName = object.getString("topicName"); String prcName=""; - prcName = "政策课题组入会流程-法规认证部副部长审核"; + prcName = topicName + "-政策课题入会流程"; - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("17"); + one1.setPrcType("30"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); @@ -75,11 +73,12 @@ public class PRGEStartAfter implements TaskListener { busProcessNews.setMsgType("clause"); busProcessNews.setPId(delegateTask.getProcessInstanceId()); busProcessNews.setMesg(object.toJSONString()); - busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey()); +// busProcessNews.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNews.setFinishFlag("0"); busProcessNews.setTaskInfo(delegateTask.getName()); busProcessNews.setTaskId(delegateTask.getId()); - busProcessNews.setUserId("start"); +// busProcessNews.setUserId("start"); + busProcessNews.setUserId(user); busProcessNews.setPrcName(prcName); busProcessNews.setCommitText(object.getString("commentText")); busBean.save(busProcessNews); @@ -91,7 +90,7 @@ public class PRGEStartAfter implements TaskListener { busProcessNewNext.setMsgType("clause"); busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); busProcessNewNext.setMesg(object.toJSONString()); - busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); +// busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(nextUser); 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 index c4c66ff2..6a77ce80 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupEnrollment/PRGEStartBefore.java @@ -3,6 +3,9 @@ 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 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 8a9afaca..89da64da 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 @@ -10,11 +10,14 @@ 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(); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); queryWrapper1.isNull("TASK_ID"); @@ -26,7 +29,7 @@ public class RevisionInformationBefore implements TaskListener { CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class); // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 - one1.setLink("zcrhStep1-1?prcType=17"); + one1.setLink("policyTopicEnrollment/step1_1?prcType=30"); 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 ece669f3..37b525e3 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 @@ -2,9 +2,6 @@ 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; @@ -17,12 +14,13 @@ 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) { @@ -32,8 +30,6 @@ public class RevisonInformationAfter 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()); @@ -42,22 +38,26 @@ public class RevisonInformationAfter implements TaskListener { JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); delegateTask.setVariable("objectJson", object); - List nextUserList = new ArrayList(); + List nextUserList = new ArrayList<>(); - if (StringUtils.isNotBlank(delegateTask.getVariable("ministerConfirm",String.class))) { - nextUserList.add(delegateTask.getVariable("ministerConfirm",String.class)); + if (StringUtils.isNotBlank(delegateTask.getVariable("ministerId",String.class))) { + List ministerIdList = Arrays.asList(object.getString("ministerId").split(",")); + delegateTask.setVariable("ministerIdList",ministerIdList); + nextUserList.addAll(ministerIdList); + } else { + throw new ActivitiException("1#2法规认证部部长不存在,请配置相关人员"); } - String user = delegateTask.getVariable("createUser", String.class); - String username = delegateTask.getVariable("createUserName", String.class); - String prcName=""; - prcName = "政策课题组入会流程-法规认证部副部长审核"; + String user = delegateTask.getVariable("applyUserId", String.class); + String username = delegateTask.getVariable("applyUserName", String.class); + String topicName = delegateTask.getVariable("topicName", String.class); + String prcName= topicName + "-政策课题组入会流程"; - QueryWrapper queryWrapper2 = new QueryWrapper(); + QueryWrapper queryWrapper2 = new QueryWrapper<>(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { - one1.setPrcType("17"); + one1.setPrcType("30"); // one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); @@ -65,7 +65,7 @@ public class RevisonInformationAfter implements TaskListener { } //存储当前节点意见 if (null != object.getString("commentText")) { - QueryWrapper queryWrapper3 = new QueryWrapper(); + QueryWrapper queryWrapper3 = new QueryWrapper<>(); queryWrapper3.eq("TASK_ID", delegateTask.getId()); queryWrapper3.eq("USER_ID", delegateTask.getAssignee()); List list = busBean.list(queryWrapper3); @@ -77,13 +77,13 @@ public class RevisonInformationAfter implements TaskListener { } } - if (nextUserList != null && !nextUserList.isEmpty()) { + if (!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.setTaskInfo(delegateTask.getTaskDefinitionKey()); busProcessNewNext.setFinishFlag("0"); busProcessNewNext.setTaskInfo(delegateTask.getName()); busProcessNewNext.setUserId(nextUser); @@ -91,8 +91,5 @@ public class RevisonInformationAfter implements TaskListener { busBean.save(busProcessNewNext); } } - - - } }