From 47d4e4af7dc9dbce7b27fdc2270c81d0262b4dae Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Dec 2021 10:12:38 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=96=B0=E7=9A=84=E5=BE=81=E6=B1=82?= =?UTF-8?q?=E6=84=8F=E8=A7=81=E6=B5=81=E7=A8=8B=20=E5=8F=91=E9=80=81OA?= =?UTF-8?q?=E5=BE=85=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/StandardCommentNewProcess/Step10Before.java | 6 ++++++ .../listener/StandardCommentNewProcess/Step1Before.java | 8 ++++++++ .../listener/StandardCommentNewProcess/Step2Before.java | 8 ++++++++ .../listener/StandardCommentNewProcess/Step3Before.java | 7 +++++++ .../listener/StandardCommentNewProcess/Step4Before.java | 7 +++++++ .../listener/StandardCommentNewProcess/Step5Before.java | 8 ++++++++ .../listener/StandardCommentNewProcess/Step6Before.java | 7 +++++++ .../listener/StandardCommentNewProcess/Step7Before.java | 7 +++++++ .../listener/StandardCommentNewProcess/Step8Before.java | 8 ++++++++ .../listener/StandardCommentNewProcess/Step9Before.java | 6 ++++++ 10 files changed, 72 insertions(+) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10Before.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10Before.java index 295a1657..4ba8a0fb 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step10Before.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess; 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; @@ -13,6 +14,7 @@ public class Step10Before 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.isNull("TASK_ID"); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); @@ -22,6 +24,10 @@ public class Step10Before implements TaskListener { one1.setTaskId(delegateTask.getId()); one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzzqyjStep9?prcType=3"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1Before.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1Before.java index 29bf0232..39b0c32f 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step1Before.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess; 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; @@ -13,6 +14,7 @@ public class Step1Before 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.isNull("TASK_ID"); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); @@ -22,6 +24,12 @@ public class Step1Before implements TaskListener { one1.setTaskId(delegateTask.getId()); one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + + + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzzqyjStep2?prcType=3"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2Before.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2Before.java index 2b7e1489..e4589470 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step2Before.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess; 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; @@ -13,6 +14,7 @@ public class Step2Before 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.isNull("TASK_ID"); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); @@ -22,6 +24,12 @@ public class Step2Before implements TaskListener { one1.setTaskId(delegateTask.getId()); one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + + + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzzqyjStep3?prcType=3"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3Before.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3Before.java index 0fb94c7f..fa81b153 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step3Before.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess; 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; @@ -13,6 +14,7 @@ public class Step3Before 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.isNull("TASK_ID"); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); @@ -22,6 +24,11 @@ public class Step3Before implements TaskListener { one1.setTaskId(delegateTask.getId()); one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzzqyjStep4?prcType=3"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4Before.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4Before.java index 20d63c16..2b19a8ba 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step4Before.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess; 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; @@ -13,6 +14,7 @@ public class Step4Before 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.isNull("TASK_ID"); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); @@ -22,6 +24,11 @@ public class Step4Before implements TaskListener { one1.setTaskId(delegateTask.getId()); one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzzqyjStep4-1?prcType=3"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5Before.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5Before.java index bc72350a..3503ba50 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step5Before.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess; 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; @@ -13,6 +14,7 @@ public class Step5Before 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.isNull("TASK_ID"); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); @@ -22,6 +24,12 @@ public class Step5Before implements TaskListener { one1.setTaskId(delegateTask.getId()); one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + + + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzzqyjStep4-1?prcType=3"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step6Before.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step6Before.java index 4b53a32b..2f77a2d5 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step6Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step6Before.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess; 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; @@ -13,6 +14,7 @@ public class Step6Before 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.isNull("TASK_ID"); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); @@ -22,6 +24,11 @@ public class Step6Before implements TaskListener { one1.setTaskId(delegateTask.getId()); one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzzqyjStep5?prcType=3"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7Before.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7Before.java index bc1049df..113e9be2 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step7Before.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess; 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; @@ -13,6 +14,7 @@ public class Step7Before 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.isNull("TASK_ID"); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); @@ -22,6 +24,11 @@ public class Step7Before implements TaskListener { one1.setTaskId(delegateTask.getId()); one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzzqyjStep6?prcType=3"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8Before.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8Before.java index e60516b6..318af862 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step8Before.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess; 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; @@ -13,6 +14,7 @@ public class Step8Before 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.isNull("TASK_ID"); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); @@ -22,6 +24,12 @@ public class Step8Before implements TaskListener { one1.setTaskId(delegateTask.getId()); one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + + + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzzqyjStep7?prcType=3"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); } } } diff --git a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9Before.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9Before.java index 9c5dcf2b..ba7befc7 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9Before.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardCommentNewProcess/Step9Before.java @@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentNewProcess; 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; @@ -13,6 +14,7 @@ public class Step9Before 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.isNull("TASK_ID"); queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId()); @@ -22,6 +24,10 @@ public class Step9Before implements TaskListener { one1.setTaskId(delegateTask.getId()); one1.setTaskInfo(delegateTask.getName()); busBean.saveOrUpdate(one1); + // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型 + one1.setLink("bzzqyjStep8?prcType=3"); + one1.setTaskInfo(delegateTask.getName()); + oaService.sendTodoMq(one1); } } } From 660faa15e3acdf8feb5c3936c3ccbaabeacfdc21 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Dec 2021 10:36:42 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=A4=96=E9=83=A8=E7=BD=B2=E5=90=8D?= =?UTF-8?q?=E6=8E=A8=E8=8D=90=E6=89=B9=E5=87=86=20--->=20=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E4=BA=A7=E7=94=9F=E5=A4=9A=E6=9D=A1=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../listener/RecommendedApproval/RAModifyInformationAfter.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 199915d4..409809a0 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 @@ -33,8 +33,7 @@ public class RAModifyInformationAfter implements TaskListener { List nextUserList = new ArrayList(); - delegateTask.setVariable("leadership",delegateTask.getVariable("leadership1",String.class)); - nextUserList.add(delegateTask.getVariable("leadership1",String.class)); + nextUserList.addAll(delegateTask.getVariable("leadershiplist",List.class)); //截止时间 流程描述 创建人 From d852cfef620029cf6a54c0af10a2a011a2300a31 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Dec 2021 15:43:03 +0800 Subject: [PATCH 3/4] =?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=E5=8F=82=E4=BC=9A=E6=B5=81?= =?UTF-8?q?=E7=A8=8B-=E5=85=A8=E4=B8=8D=E6=B6=89=E5=8F=8A=E6=83=85?= =?UTF-8?q?=E5=86=B5=E4=B8=8B=E7=9A=84=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../StandardMeetProcess/DirectorChooseAfter.java | 12 ++++++++++++ .../DirectorChooseAfter.java | 15 ++++++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) 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 d82b3d03..d77a228b 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 @@ -15,7 +15,9 @@ import org.activiti.engine.ActivitiException; 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; /** @@ -65,9 +67,15 @@ public class DirectorChooseAfter implements TaskListener { }else { delegateTask.setVariable("memberList",nextUserList); } + delegateTask.setVariable("passFlag","0"); delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); } + if (delegateTask.getVariable("memberList",List.class).size()==0){ + delegateTask.setVariable("passFlag","1"); + prcName = prcName + "流程结束"; + } + // 存储当前节点意见 if (null != object.getString("commentText")) { @@ -93,7 +101,11 @@ public class DirectorChooseAfter implements TaskListener { QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID", delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2); + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); if (one1 != null) { + if ("1".equals(delegateTask.getVariable("passFlag"))){ + one1.setOverTime(OVERTIME); + } one1.setPrcType("21"); one1.setPrcName(prcName); one1.setCreatUser(user); 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 b2c3df50..b0a5235b 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 @@ -14,7 +14,9 @@ import org.activiti.engine.ActivitiException; 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; /** @@ -45,7 +47,7 @@ public class DirectorChooseAfter implements TaskListener { } //全员不通过，检测条件 directorCount - Integer allCount = delegateTask.getVariable("directorList",List.class).size();; + Integer allCount = delegateTask.getVariable("directorList",List.class).size(); Integer count = 0; if(null == delegateTask.getVariable("directorCount")){ delegateTask.setVariable("directorCount", count); @@ -63,9 +65,13 @@ public class DirectorChooseAfter implements TaskListener { }else { delegateTask.setVariable("memberList",nextUserList); } + delegateTask.setVariable("passFlag","0"); delegateTask.setVariable("memberCount",delegateTask.getVariable("memberList",List.class).size()); } - + if (delegateTask.getVariable("memberList",List.class).size()==0){ + delegateTask.setVariable("passFlag","1"); + prcName = prcName + "流程结束"; + } // 存储当前节点意见 if (null != object.getString("commentText")) { @@ -88,11 +94,14 @@ public class DirectorChooseAfter implements TaskListener { String standName = object.getString("listName"); delegateTask.setVariable("listName", 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(delegateTask.getVariable("passFlag"))){ + one1.setOverTime(OVERTIME); + } one1.setPrcType("20"); one1.setPrcName(prcName); one1.setCreatUser(user); From f8cdb28f09945fe72c69fcc25ab9d560eb788fd5 Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 15 Dec 2021 17:06:28 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=8A=A0=E5=90=8D=E7=A7=B0=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../standardRead/DeptApplayAfter.java | 27 ++++++++------ .../listener/standardRead/DeptZrAfter.java | 2 +- .../standardRead/EngineerApplayAfter.java | 37 +++++++++++-------- .../listener/standardRead/ExpainAfter.java | 2 +- .../listener/standardRead/ResolveAfter.java | 2 +- .../listener/standardRead/ZrApplayAfter.java | 34 +++++++++-------- 6 files changed, 58 insertions(+), 46 deletions(-) diff --git a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java index b14a44f0..d7830822 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayAfter.java @@ -43,6 +43,19 @@ public class DeptApplayAfter implements TaskListener{ delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); + + String standName = ""; + if (null == object.getString("standInData")){ + standName = "未知"; + }else { + if(object.getString("standInData").equals("INLAND")){ + standName = "国内"; + }else { + standName = "海外"; + } + } + String prcName = standName+"-标准解读流程"; + //部长进行审批（1：通过） if (object.getString("gcApplyFlag").equals("1")) { delegateTask.setVariable("bzFlag", 1); @@ -108,24 +121,16 @@ public class DeptApplayAfter implements TaskListener{ lawsUserInfoService.sarStandItemsSaveBatch(sarStandItems); lawsUserInfoService.SarInterpretationNationalStandardSaveBatch(standards); + prcName=prcName+"-流程结束"; } else { delegateTask.setVariable("bzFlag", 2); + prcName=prcName+"-填写解读分析"; } //截止时间 流程描述 创建人 String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); String user = object.getString("applyUserId"); String username = object.getString("applyUserIdName"); - String standName = ""; - if (null == object.getString("standInData")){ - standName = "未知"; - }else { - if(object.getString("standInData").equals("INLAND")){ - standName = "国内"; - }else { - standName = "海外"; - } - } - String 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/standardRead/DeptZrAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java index a94b9e78..64013a9d 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrAfter.java @@ -67,7 +67,7 @@ public class DeptZrAfter implements TaskListener{ standName = "海外"; } } - String prcName = standName+"-标准解读流程"; + String 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/standardRead/EngineerApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java index b6f9c16d..e3614f93 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayAfter.java @@ -36,22 +36,7 @@ public class EngineerApplayAfter implements TaskListener{ delegateTask.setVariable("objectJson", object); List nextUserList = new ArrayList(); - //工程师是否要进行审核 - if (object.getString("zrApplyFlag").equals("1")) { - delegateTask.setVariable("gcFlag", 1); - if (StringUtils.isNotBlank(object.getString("deptUserId"))) { - delegateTask.setVariable("deptUserId", object.getString("deptUserId")); - nextUserList.add(object.getString("deptUserId")); - } - } else { - delegateTask.setVariable("gcFlag", 2); - JSONObject object1=delegateTask.getVariable("zxUserId",JSONObject.class); - nextUserList.add(object1.getString("id")); - } - //截止时间 流程描述 创建人 - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("applyUserId"); - String username = object.getString("applyUserIdName"); + String standName = ""; if (null == object.getString("standInData")){ standName = "未知"; @@ -63,6 +48,26 @@ public class EngineerApplayAfter implements TaskListener{ } } String prcName = standName + "-标准解读流程"; + + //工程师是否要进行审核 + if (object.getString("zrApplyFlag").equals("1")) { + delegateTask.setVariable("gcFlag", 1); + prcName=prcName+"-部长审批"; + if (StringUtils.isNotBlank(object.getString("deptUserId"))) { + delegateTask.setVariable("deptUserId", object.getString("deptUserId")); + nextUserList.add(object.getString("deptUserId")); + } + } else { + prcName=prcName+"-填写解读分析"; + delegateTask.setVariable("gcFlag", 2); + JSONObject object1=delegateTask.getVariable("zxUserId",JSONObject.class); + nextUserList.add(object1.getString("id")); + } + //截止时间 流程描述 创建人 + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("applyUserId"); + String username = object.getString("applyUserIdName"); + 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/standardRead/ExpainAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java index e840a25b..abc8a166 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainAfter.java @@ -51,7 +51,7 @@ public class ExpainAfter implements TaskListener{ standName = "海外"; } } - String prcName = standName+"-标准解读流程"; + String 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/standardRead/ResolveAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java index 45f33539..25b5dea8 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ResolveAfter.java @@ -74,7 +74,7 @@ public class ResolveAfter implements TaskListener{ standName = "海外"; } } - String prcName = standName+"-标准解读流程"; + String 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/standardRead/ZrApplayAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java index 894184e2..bf0769ce 100644 --- a/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java +++ b/src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayAfter.java @@ -36,22 +36,6 @@ public class ZrApplayAfter implements TaskListener{ delegateTask.setVariable("objectJson",object); List nextUserList = new ArrayList(); - //责任人是否要进行审核 - if(object.getString("resolveFlag").equals("1")){ - delegateTask.setVariable("zrFlag",1); - if(StringUtils.isNotBlank(object.getString("applyUserId"))){ - delegateTask.setVariable("engineerUserId",object.getString("applyUserId")); - nextUserList.add(object.getString("applyUserId")); - } - }else { - delegateTask.setVariable("zrFlag",2); - JSONObject object1=JSONObject.parseObject(String.valueOf(delegateTask.getVariable("zxUserId"))); - nextUserList.add(String.valueOf(object1.getString("id"))); - } - //截止时间 流程描述 创建人 - String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); - String user = object.getString("applyUserId"); - String username = object.getString("applyUserIdName"); String standName = ""; if (null == object.getString("standInData")){ standName = "未知"; @@ -63,6 +47,24 @@ public class ZrApplayAfter implements TaskListener{ } } String prcName = standName+"-标准解读流程"; + //责任人是否要进行审核 + if(object.getString("resolveFlag").equals("1")){ + delegateTask.setVariable("zrFlag",1); + prcName=prcName+"-工程师审核"; + if(StringUtils.isNotBlank(object.getString("applyUserId"))){ + delegateTask.setVariable("engineerUserId",object.getString("applyUserId")); + nextUserList.add(object.getString("applyUserId")); + } + }else { + prcName=prcName+"-填写解读分析"; + delegateTask.setVariable("zrFlag",2); + JSONObject object1=JSONObject.parseObject(String.valueOf(delegateTask.getVariable("zxUserId"))); + nextUserList.add(String.valueOf(object1.getString("id"))); + } + //截止时间 流程描述 创建人 + String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()); + String user = object.getString("applyUserId"); + String username = object.getString("applyUserIdName"); QueryWrapper queryWrapper2 = new QueryWrapper(); queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId()); BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);