Merge branch 'develop' into FOTON

src/main/java/com/ydw/bat/wkflow/listener/RecommendedApproval/RAModifyInformationAfter.java

@@ -33,8 +33,7 @@ public class RAModifyInformationAfter implements TaskListener {
 
         List<String> nextUserList = new ArrayList();
 
-        delegateTask.setVariable("leadership",delegateTask.getVariable("leadership1",String.class));
+        nextUserList.addAll(delegateTask.getVariable("leadershiplist",List.class));
-        nextUserList.add(delegateTask.getVariable("leadership1",String.class));
 
 
         //截止时间 流程描述 创建人

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);
         }
     }
 }

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);
         }
     }
 }

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);
         }
     }
 }

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);
         }
     }
 }

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);
         }
     }
 }

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);
         }
     }
 }

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);
         }
     }
 }

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);
         }
     }
 }

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);
         }
     }
 }

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);
         }
     }
 }