From 899b1153e1012edfc3ae1085a2c0e7f30a723036 Mon Sep 17 00:00:00 2001 From: yinglong zhang <1679309912@qq.com> Date: Thu, 8 Jul 2021 21:03:30 +0800 Subject: [PATCH] =?UTF-8?q?add=20=E8=B0=83=E7=A0=94=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SelectDockUserAfter.java | 125 ++++++++++++++ .../SelectDockUserBefore.java | 29 ++++ .../SelectResponUserAfter.java | 155 ++++++++++++++++++ .../SelectResponUserBefore.java | 28 ++++ .../StartSurveyAfter.java | 100 +++++++++++ .../StartSurveyBefore.java | 27 +++ .../UploadCommentBefore.java | 28 ++++ .../DirectorSignAfter.java | 3 +- .../DockingApprovalAfter.java | 2 +- .../MinisterAndDockerSignAfter.java | 2 +- .../PresidentSignAfter.java | 2 +- .../ResponUserSignAfter.java | 2 +- .../SelectResponsibleUserAfter.java | 5 +- .../StartSurveyAfter.java | 2 +- .../SummarySurveyAfter.java | 2 +- .../UploadResearchResultAfter.java | 10 +- 16 files changed, 507 insertions(+), 15 deletions(-) create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyAfter.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyBefore.java create mode 100644 src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentBefore.java diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserAfter.java new file mode 100644 index 00000000..5e245141 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserAfter.java @@ -0,0 +1,125 @@ +package com.ydw.bat.wkflow.listener.NonConformanceRectification; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +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.ArrayList; +import java.util.Date; +import java.util.List; + +public class SelectDockUserAfter 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()); + + List nextUserList = new ArrayList(); + + delegateTask.setVariable("selectResponUserState",0); + delegateTask.setVariable("actionFlag",0); + + JSONArray dockUserList=delegateTask.getVariable("dockUserList", JSONArray.class); + if(dockUserList==null)dockUserList=new JSONArray(); + JSONArray preDockUserListOrg=object.getJSONArray("dockUserList"); + JSONArray preDockUserList=new JSONArray(); + + for (Object o : preDockUserListOrg) { + boolean ok=true; + JSONObject preDockUserOrg=(JSONObject)o; + for (Object o1 : dockUserList) { + JSONObject dockUser=(JSONObject)o1; + if(dockUser.getString("id").equals(preDockUserOrg.getString("id"))){ + ok=false;break; + } + } + if(ok){ + preDockUserList.add(preDockUserOrg); + nextUserList.add(preDockUserOrg.getString("id")); + } + } + delegateTask.setVariable("preDockUserList",preDockUserList); + + delegateTask.setVariable("objectJson",object); + + + //截止时间 流程描述 创建人 + 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 = 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); + } + + + + // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setUserId(delegateTask.getAssignee()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + + QueryWrapper updataWapper=new QueryWrapper(); + updataWapper.eq("TASK_ID",delegateTask.getId()); + updataWapper.eq("P_ID",delegateTask.getProcessInstanceId()); + busBean.update(busProcessNew,updataWapper); + + 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.setFinishFlag("0"); + busProcessNewNext.setTaskInfo(delegateTask.getName()); + busProcessNewNext.setUserId(nextUser); + 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(delegateTask.getVariable("engineer",String.class)); + busBean.save(busProcessNewNext); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserBefore.java new file mode 100644 index 00000000..b53d97bd --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserBefore.java @@ -0,0 +1,29 @@ +package com.ydw.bat.wkflow.listener.NonConformanceRectification; + +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 SelectDockUserBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + } + } +} + diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java new file mode 100644 index 00000000..70c58b13 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserAfter.java @@ -0,0 +1,155 @@ +package com.ydw.bat.wkflow.listener.NonConformanceRectification; + +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +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 springfox.documentation.spring.web.json.Json; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +public class SelectResponUserAfter 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(); + + Integer actionFlag=object.getInteger("actionFlag"); + Integer allActionFlag=delegateTask.getVariable("actionFlag",Integer.class); + if(actionFlag==null)actionFlag=0; + if(actionFlag==1)allActionFlag=1; + delegateTask.setVariable("actionFlag",allActionFlag); + + JSONArray responUserList=(delegateTask.getVariable("responUserList",JSONArray.class)); + if(responUserList==null)responUserList=new JSONArray(); + if(actionFlag==0){ + JSONArray dockUserList=(delegateTask.getVariable("dockUserList",JSONArray.class)); + if(dockUserList==null)dockUserList=new JSONArray(); + JSONObject preDockUser=(delegateTask.getVariable("preDockUser",JSONObject.class)); + dockUserList.add(preDockUser); + delegateTask.setVariable("dockUserList",dockUserList); + + + + JSONArray preResponUserList=object.getJSONArray("responUserList"); + + for (Object o : preResponUserList) { + JSONObject preResponUser=(JSONObject)o; + boolean ok=true; + for (Object o1 : responUserList) { + JSONObject responUser=(JSONObject)o1; + if(responUser.getString("id").equals(preResponUser.get("id"))&&responUser.getString("dockUser").equals(delegateTask.getAssignee())){ + ok=false;break; + } + } + if(ok){ + preResponUser.put("dockUser",delegateTask.getAssignee()); + responUserList.add(preResponUser); + } + } + delegateTask.setVariable("responUserList",responUserList); + } + + + delegateTask.setVariable("objectJson",object); + + + + + //截止时间 流程描述 创建人 + 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 = 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); + } + + + + // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setUserId(delegateTask.getAssignee()); + busProcessNew.setTaskId(delegateTask.getId()); + busProcessNew.setCommitText(object.getString("commentText")); + busProcessNew.setFinishFlag("0"); + busProcessNew.setTaskInfo(delegateTask.getName()); + + QueryWrapper updataWapper=new QueryWrapper(); + updataWapper.eq("TASK_ID",delegateTask.getId()); + updataWapper.eq("P_ID",delegateTask.getProcessInstanceId()); + busBean.update(busProcessNew,updataWapper); + + Integer selectResponUserState=delegateTask.getVariable("selectResponUserState",Integer.class); + if(selectResponUserState==null)selectResponUserState=0; + if(actionFlag==0)selectResponUserState++; + delegateTask.setVariable("selectResponUserState",selectResponUserState); + JSONArray dockUserList=(delegateTask.getVariable("preDockUserList",JSONArray.class)); + + if(selectResponUserState>=dockUserList.size()){ + if(allActionFlag==1){ + + BusProcessNew busProcessNewNext = new BusProcessNew(); + busProcessNewNext.setMsgType("clause"); + busProcessNewNext.setPId(delegateTask.getProcessInstanceId()); + busProcessNewNext.setMesg(object.toJSONString()); + busProcessNewNext.setFinishFlag("0"); + busProcessNewNext.setTaskInfo("下发至标准法规工程师"); + busProcessNewNext.setUserId(delegateTask.getVariable("engineer",String.class)); + busBean.save(busProcessNewNext); + + }else { + for (Object o : responUserList) { + JSONObject responUser=(JSONObject)o; + 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(responUser.getString("id")); + busBean.save(busProcessNewNext); + } + + } + } + + } +} \ No newline at end of file diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserBefore.java new file mode 100644 index 00000000..8148210b --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserBefore.java @@ -0,0 +1,28 @@ +package com.ydw.bat.wkflow.listener.NonConformanceRectification; + +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 SelectResponUserBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyAfter.java new file mode 100644 index 00000000..8f9d2921 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyAfter.java @@ -0,0 +1,100 @@ +package com.ydw.bat.wkflow.listener.NonConformanceRectification; + +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.ArrayList; +import java.util.Date; +import java.util.List; + +public class StartSurveyAfter 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("startUser",object.get("startUser")); + delegateTask.setVariable("engineer",object.get("engineer")); + + + + + //截止时间 流程描述 创建人 + 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 = 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); + } + + + + // 存储当前节点意见 + BusProcessNew busProcessNew = new BusProcessNew(); + busProcessNew.setMsgType("clause"); + busProcessNew.setPId(delegateTask.getProcessInstanceId()); + busProcessNew.setMesg(object.toJSONString()); + busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey()); + busProcessNew.setUserId(delegateTask.getAssignee()); + 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); + 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(delegateTask.getVariable("engineer",String.class)); + busBean.save(busProcessNewNext); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyBefore.java new file mode 100644 index 00000000..37a4425d --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/StartSurveyBefore.java @@ -0,0 +1,27 @@ +package com.ydw.bat.wkflow.listener.NonConformanceRectification; + +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 StartSurveyBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { +// IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); +// QueryWrapper queryWrapper1 = new QueryWrapper(); +// queryWrapper1.isNull("TASK_ID"); +// queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); +// List list = busBean.list(queryWrapper1); +// if(!list.isEmpty()){ +// BusProcessNew one1 = list.get(0); +// one1.setTaskId(delegateTask.getId()); +// one1.setTaskInfo(delegateTask.getName()); +// busBean.saveOrUpdate(one1); +// } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentBefore.java new file mode 100644 index 00000000..f67c3995 --- /dev/null +++ b/src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentBefore.java @@ -0,0 +1,28 @@ +package com.ydw.bat.wkflow.listener.NonConformanceRectification; + +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 UploadCommentBefore implements TaskListener { + @Override + public void notify(DelegateTask delegateTask) { + IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class); + QueryWrapper queryWrapper1 = new QueryWrapper(); + queryWrapper1.isNull("TASK_ID"); + queryWrapper1.eq("USER_ID",delegateTask.getAssignee()); + queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); + List list = busBean.list(queryWrapper1); + if(!list.isEmpty()){ + BusProcessNew one1 = list.get(0); + one1.setTaskId(delegateTask.getId()); + one1.setTaskInfo(delegateTask.getName()); + busBean.saveOrUpdate(one1); + } + } +} diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java index ca125974..d225c9f1 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignAfter.java @@ -52,7 +52,7 @@ public class DirectorSignAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("3"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); @@ -81,7 +81,6 @@ public class DirectorSignAfter implements TaskListener { 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); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java index 062c5984..bbcbeabf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalAfter.java @@ -50,7 +50,7 @@ public class DockingApprovalAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("3"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java index 7c726c30..a69a84bf 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignAfter.java @@ -54,7 +54,7 @@ public class MinisterAndDockerSignAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("3"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java index 7cca685c..c185ac18 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignAfter.java @@ -51,7 +51,7 @@ public class PresidentSignAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if (one1 != null) { one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("3"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java index 905a44ab..8636fe24 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignAfter.java @@ -59,7 +59,7 @@ public class ResponUserSignAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("3"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java index 3a37b806..2b61595c 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserAfter.java @@ -42,7 +42,6 @@ public class SelectResponsibleUserAfter implements TaskListener { String userListString=object.getString("responUserList"); String userListStringName=object.getString("responUserListName"); - String userListStringDepartment=object.getString("responUserListNameDepartment"); List responUserList = Arrays.asList(userListString.split(",")); for (int i = 0; i < responUserList.size(); i++) { @@ -55,7 +54,6 @@ public class SelectResponsibleUserAfter implements TaskListener { } nextUserList=responUserList1; - List responUserListNameDepartment= Arrays.asList(userListStringDepartment.split(",").clone()); JSONArray userListJson= JSON.parseArray(delegateTask.getVariable("responUserListInfo",String.class)); if(userListJson==null)userListJson=new JSONArray(); @@ -63,7 +61,6 @@ public class SelectResponsibleUserAfter implements TaskListener { JSONObject json=new JSONObject(); json.put("id",responUserList.get(i)); json.put("name",responUserListName.get(i)); - json.put("department",responUserListNameDepartment.get(i)); json.put("dockUser",delegateTask.getAssignee()); json.put("info",new JSONArray()); userListJson.add(json); @@ -91,7 +88,7 @@ public class SelectResponsibleUserAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("3"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java index e8061620..4ed6bed6 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/StartSurveyAfter.java @@ -68,7 +68,7 @@ public class StartSurveyAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("3"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java index 627d1fa7..63df4e0a 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyAfter.java @@ -56,7 +56,7 @@ public class SummarySurveyAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("3"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username); diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java index 6d26aa39..fe045070 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultAfter.java @@ -41,11 +41,15 @@ public class UploadResearchResultAfter implements TaskListener { JSONObject jsonObject= (JSONObject) responUserListInfo.get(i); if(jsonObject.getString("id").equals(delegateTask.getAssignee())){ if(jsonObject.getString("dockUser").equals(object.getString("dockUser"))){ - JSONArray info = jsonObject.getObject("info", JSONArray.class); - info.add(object.get("info")); + jsonObject.put("department",object.getString("department")); + JSONArray info = jsonObject.getObject("info", JSONArray.class); + info.addAll(object.getJSONArray("info")); + jsonObject.put("info",info); object.put("responUser",jsonObject.getString("id")); object.put("responUserName",jsonObject.getString("name")); + + responUserListInfo.set(i,jsonObject); break; } } @@ -71,7 +75,7 @@ public class UploadResearchResultAfter implements TaskListener { BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); if(one1!=null){ one1.setOverTime(OVERTIME); - one1.setPrcType("1"); + one1.setPrcType("3"); one1.setPrcName(prcName); one1.setCreatUser(user); one1.setCreatUserName(username);