diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java index 4646675c..82d84bd5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ApplyApplicantAfter.java @@ -2,16 +2,23 @@ package com.ydw.bat.wkflow.listener.standardLibrary; 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; /** * 标准入库申请人修订后manager @@ -28,44 +35,56 @@ public class ApplyApplicantAfter implements TaskListener{ Datas datas = datasService.getOne(queryWrapper); JSONObject object = JSONObject.parseObject(datas.getFormValsJson()); + delegateTask.setVariable("objectJson",object); - JSONObject array = object.getJSONObject("hqsqForm"); - boolean flag = true; - if(array.getString("opinion").equals("1")){ - flag=false; + List nextUserList = new ArrayList(); + +// JSONObject array = object.getJSONObject("hqsqForm"); + + 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 = ""; + if(object.getString("standInData").equals("0")){ + standName = "国内"; + }else { + standName = "国外"; + } + String prcName = standName+"-标准入库"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setOverTime(OVERTIME); + one1.setPrcType("1"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + 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(nextUser); + busBean.save(busProcessNew); + } } -// if(!flag){ - delegateTask.setVariable("jlspFlag",1); - BusProcessNew busProcessNew = new BusProcessNew(); - busProcessNew.setUserId(delegateTask.getVariable("fqr").toString()); - busProcessNew.setPId(delegateTask.getProcessInstanceId()); - busProcessNew.setFinishFlag("0"); - busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); - busProcessNew.setMsgType("10"); - array.put("opinionTime",new Date()); - busProcessNew.setMesg(object.toJSONString()); - busBean.save(busProcessNew); -// -// QueryWrapper queryWrapper1 = new QueryWrapper(); -// queryWrapper1.eq("TASK_ID",delegateTask.getId()); -// BusProcessNew one1 = busBean.getOne(queryWrapper1); -// if(one1!=null){ -// one1.setCommitFlag("1"); -//// one1.setCommitText(array.getString("opinionContent")); -// busBean.saveOrUpdate(one1); -// } -// }else{ -// delegateTask.setVariable("jlspFlag",0); -// -// QueryWrapper queryWrapper1 = new QueryWrapper(); -// queryWrapper1.eq("TASK_ID",delegateTask.getId()); -// BusProcessNew one1 = busBean.getOne(queryWrapper1); -// if(one1!=null){ -// one1.setCommitFlag("0"); -//// one1.setCommitText(array.getString("opinionContent")); -// busBean.saveOrUpdate(one1); -// } -// } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java new file mode 100644 index 00000000..229f36a2 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignAfter.java @@ -0,0 +1,89 @@ +package com.ydw.bat.wkflow.listener.standardLibrary; + +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.Date; +import java.util.List; + +/** + * 标准入库申请人会签后manager + */ +public class CountersignAfter 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(); + +// JSONObject array = object.getJSONObject("hqsqForm"); + + 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 = ""; + if(object.getString("standInData").equals("0")){ + standName = "国内"; + }else { + standName = "国外"; + } + String prcName = standName+"-标准入库"; + QueryWrapper queryWrapper2 = new QueryWrapper(); + queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); + BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + if(one1!=null){ + one1.setOverTime(OVERTIME); + one1.setPrcType("1"); + one1.setPrcName(prcName); + one1.setCreatUser(user); + one1.setCreatUserName(username); + busProcessNameService.saveOrUpdate(one1); + } + + if(nextUserList != null && !nextUserList.isEmpty()){ + for(String nextUser : nextUserList){ + 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(nextUser); + busBean.save(busProcessNew); + } + } + + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignBefore.java new file mode 100644 index 00000000..70da4d04 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/CountersignBefore.java @@ -0,0 +1,28 @@ +package com.ydw.bat.wkflow.listener.standardLibrary; + +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.util.SpringContextUtil; +import org.activiti.engine.delegate.DelegateTask; +import org.activiti.engine.delegate.TaskListener; + +import java.util.List; + +/** + * 标准入库会签前 + */ +public class CountersignBefore 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/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApplicantAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java similarity index 95% rename from src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApplicantAfter.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java index 2b367e7c..ef8f02ad 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApplicantAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveAfter.java @@ -18,7 +18,7 @@ import java.util.Date; /** * 经理人审批后 */ -public class ManagerApplicantAfter implements TaskListener{ +public class ManagerApproveAfter implements TaskListener{ @Override public void notify(DelegateTask delegateTask) { IDatasService datasService = SpringContextUtil.getBean(IDatasService.class); @@ -60,6 +60,7 @@ public class ManagerApplicantAfter implements TaskListener{ 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/standardLibrary/ManagerApplicantBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveBefore.java similarity index 95% rename from src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApplicantBefore.java rename to src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveBefore.java index 219b0726..0eb5e0cd 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApplicantBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/ManagerApproveBefore.java @@ -15,7 +15,7 @@ import java.util.List; /** * 经理人审批前 */ -public class ManagerApplicantBefore implements TaskListener{ +public class ManagerApproveBefore implements TaskListener{ @Override public void notify(DelegateTask delegateTask) { IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); 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 bedf8c30..988bcbfe 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 @@ -94,17 +94,29 @@ public class SLApplicantAfter implements TaskListener{ 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 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(nextUser); - busBean.save(busProcessNew); + 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); + busBean.save(busProcessNewNext); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantBefore.java index 7793aa50..401a7e68 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantBefore.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardLibrary/SLApplicantBefore.java @@ -20,15 +20,15 @@ public class SLApplicantBefore 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); - } +// 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,"会前申请流程");