feat: There is no way the All process before add oa

src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java

@@ -53,8 +53,13 @@ public class TaskController {
 		queryWrapper.eq("TASK_ID",taskId);
 		queryWrapper.eq("P_ID",pId);
 		queryWrapper.eq("COMMIT_FLAG","0");
-		long count = iBusProcessNewService.count(queryWrapper);
+		long count1 = iBusProcessNewService.count(queryWrapper);
-		return count;
+		QueryWrapper queryWrapper1 = new QueryWrapper();
+		queryWrapper1.eq("TASK_ID",taskId);
+		queryWrapper1.eq("P_ID",pId);
+		queryWrapper1.eq("FINISH_FLAG","0");
+		long count2 = iBusProcessNewService.count(queryWrapper1);
+		return count1 + count2;
 
 	}
 

src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/DockingApprovalBefore.java

@@ -3,6 +3,7 @@ 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.business_mq.service.CreateMQService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -25,6 +26,11 @@ public class DockingApprovalBefore implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("wfhxzgStep5?prcType=8");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectDockUserBefore.java

@@ -3,6 +3,7 @@ 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.business_mq.service.CreateMQService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -23,6 +24,11 @@ public class SelectDockUserBefore  implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("wfhxzgStep2?prcType=8");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/SelectResponUserBefore.java

@@ -3,6 +3,7 @@ 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.business_mq.service.CreateMQService;
 import com.ydw.bat.wkflow.util.SpringContextUtil;
 import org.activiti.engine.delegate.DelegateTask;
 import org.activiti.engine.delegate.TaskListener;
@@ -23,6 +24,11 @@ public class SelectResponUserBefore implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("wfhxzgStep3?prcType=8");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/NonConformanceRectification/UploadCommentBefore.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 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;
@@ -28,6 +29,11 @@ public class UploadCommentBefore  implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("wfhxzgStep4?prcType=8");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAComplianceAssessmentBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment;
 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;
@@ -23,6 +24,11 @@ public class PCAComplianceAssessmentBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpg2Step6?prcType=6");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzManagerApproveBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment;
 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;
@@ -23,6 +24,11 @@ public class PCAbzManagerApproveBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpg2Step2?prcType=6");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAbzfgManagerApproveBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment;
 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;
@@ -23,6 +24,11 @@ public class PCAbzfgManagerApproveBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpg2Step10?prcType=6");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAdlApproveBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment;
 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;
@@ -23,6 +24,12 @@ public class PCAdlApproveBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpg2Step12?prcType=6");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableApproveBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment;
 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;
@@ -23,6 +24,11 @@ public class PCAffLiableApproveBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpg2Step7?prcType=6");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAffLiableDistirbuteBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment;
 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;
@@ -23,6 +24,11 @@ public class PCAffLiableDistirbuteBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpg2Step5?prcType=6");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerApproveBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment;
 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;
@@ -23,6 +24,11 @@ public class PCAgcManagerApproveBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpg2Step9?prcType=6");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAgcManagerDeliverBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment;
 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;
@@ -23,6 +24,11 @@ public class PCAgcManagerDeliverBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpg2Step3?prcType=6");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerApproveBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment;
 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;
@@ -23,6 +24,11 @@ public class PCAjgManagerApproveBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpg2Step8?prcType=6");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAjgManagerDistributeBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment;
 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;
@@ -23,6 +24,11 @@ public class PCAjgManagerDistributeBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpg2Step4?prcType=6");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/ProjectComplianceAssessment/PCAsumBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.ProjectComplianceAssessment;
 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;
@@ -23,6 +24,11 @@ public class PCAsumBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpg2Step11?prcType=6");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DirectorSignBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentProcess;
 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,8 @@ public class DirectorSignBefore 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());
@@ -21,6 +24,10 @@ public class DirectorSignBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzzqyjStep8?prcType=3");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/DockingApprovalBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentProcess;
 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,8 +14,7 @@ public class DockingApprovalBefore 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");
@@ -26,6 +26,10 @@ public class DockingApprovalBefore implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzzqyjStep4?prcType=3");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/MinisterAndDockerSignBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentProcess;
 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,8 @@ public class MinisterAndDockerSignBefore 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("USER_ID",delegateTask.getAssignee());
@@ -23,6 +26,10 @@ public class MinisterAndDockerSignBefore implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo("标准法规部部长 "+"责任部门对接人 审批");
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzzqyjStep7?prcType=3");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/PresidentSignBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentProcess;
 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,8 @@ public class PresidentSignBefore 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 +25,10 @@ public class PresidentSignBefore implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzzqyjStep9?prcType=3");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/ResponUserSignBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentProcess;
 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,8 @@ public class ResponUserSignBefore 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 +25,10 @@ public class ResponUserSignBefore implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzzqyjStep6?prcType=3");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SelectResponsibleUserBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentProcess;
 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,8 @@ public class SelectResponsibleUserBefore 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("USER_ID",delegateTask.getAssignee());
@@ -23,6 +26,10 @@ public class SelectResponsibleUserBefore implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzzqyjStep2?prcType=3");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/SummarySurveyBefore.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 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;
@@ -16,6 +17,8 @@ public class SummarySurveyBefore 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());
@@ -59,6 +62,10 @@ public class SummarySurveyBefore implements TaskListener {
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
 
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzzqyjStep5?prcType=3");
+            oaService.sendTodoMq(one1);
+
             /*JSONObject obj= JSON.parseObject(one1.getMesg());
 
             //看全局变量里有没有存Summary,有的话就直接走，没的话就就初始化

src/main/java/com/ydw/bat/wkflow/listener/StandardCommentProcess/UploadResearchResultBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardCommentProcess;
 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,8 @@ public class UploadResearchResultBefore  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("USER_ID",delegateTask.getAssignee());
@@ -23,6 +26,10 @@ public class UploadResearchResultBefore  implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzzqyjStep3?prcType=3");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DirectorSignBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardSurvey;
 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,8 @@ public class DirectorSignBefore 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());
@@ -21,6 +24,10 @@ public class DirectorSignBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzdyStep8?prcType=2");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/DockingApprovalBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardSurvey;
 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,8 +14,7 @@ public class DockingApprovalBefore 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");
@@ -26,6 +26,10 @@ public class DockingApprovalBefore implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzdyStep4?prcType=2");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/MinisterAndDockerSignBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardSurvey;
 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,8 @@ public class MinisterAndDockerSignBefore 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("USER_ID",delegateTask.getAssignee());
@@ -23,6 +26,10 @@ public class MinisterAndDockerSignBefore implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzdyStep7?prcType=2");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/PresidentSignBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardSurvey;
 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,8 @@ public class PresidentSignBefore 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 +25,10 @@ public class PresidentSignBefore implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzdyStep9?prcType=2");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/ResponUserSignBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardSurvey;
 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,8 @@ public class ResponUserSignBefore 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 +25,10 @@ public class ResponUserSignBefore implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzdyStep6?prcType=2");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SelectResponsibleUserBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardSurvey;
 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,8 @@ public class SelectResponsibleUserBefore 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("USER_ID",delegateTask.getAssignee());
@@ -23,6 +26,10 @@ public class SelectResponsibleUserBefore implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzdyStep2?prcType=2");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/SummarySurveyBefore.java

@@ -6,6 +6,7 @@ import com.alibaba.fastjson.JSONObject;
 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;
@@ -16,6 +17,8 @@ public class SummarySurveyBefore 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());
@@ -29,6 +32,10 @@ public class SummarySurveyBefore implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzdyStep5?prcType=2");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.StandardSurvey;
 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,8 @@ public class UploadResearchResultBefore  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("USER_ID",delegateTask.getAssignee());
@@ -23,6 +26,10 @@ public class UploadResearchResultBefore  implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzdyStep3?prcType=2");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/confirmBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.itemlistvalidationprocess;
 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;
@@ -22,6 +23,11 @@ public class confirmBefore implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmqdqrStep2?prcType=10");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/itemlistvalidationprocess/itemlistvalidationprocessStartBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.itemlistvalidationprocess;
 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;
@@ -22,6 +23,11 @@ public class itemlistvalidationprocessStartBefore implements TaskListener {
             one1.setTaskId(delegateTask.getId());
             one1.setTaskInfo(delegateTask.getName());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmqdqrStep3?prcType=10");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPDepartLeaderBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.projectEvaluationProcess;
 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;
@@ -14,6 +15,7 @@ public class PEPDepartLeaderBefore implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
         IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+
         QueryWrapper queryWrapper1 = new QueryWrapper();
         queryWrapper1.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
@@ -23,6 +25,11 @@ public class PEPDepartLeaderBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpgStep7?prcType=5");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPSumBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.projectEvaluationProcess;
 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;
@@ -14,6 +15,8 @@ public class PEPSumBefore 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.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
@@ -23,6 +26,10 @@ public class PEPSumBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpgStep6?prcType=5");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPffresPersonBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.projectEvaluationProcess;
 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;
@@ -14,6 +15,8 @@ public class PEPffresPersonBefore 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.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
@@ -23,6 +26,10 @@ public class PEPffresPersonBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpgStep5?prcType=5");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPmanagerApproveBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.projectEvaluationProcess;
 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;
@@ -14,6 +15,8 @@ public class PEPmanagerApproveBefore 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.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.isNull("TASK_ID");
@@ -22,6 +25,10 @@ public class PEPmanagerApproveBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpgStep2?prcType=5");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskEstimateBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.projectEvaluationProcess;
 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;
@@ -14,6 +15,8 @@ public class PEPtaskEstimateBefore 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.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
@@ -23,6 +26,10 @@ public class PEPtaskEstimateBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpgStep4?prcType=5");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationProcess/PEPtaskLssueBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.projectEvaluationProcess;
 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;
@@ -14,6 +15,8 @@ public class PEPtaskLssueBefore 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.eq("P_ID",delegateTask.getProcessInstanceId());
         queryWrapper1.eq("USER_ID",delegateTask.getAssignee());
@@ -23,6 +26,10 @@ public class PEPtaskLssueBefore implements TaskListener {
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("xmpgStep3?prcType=5");
+            oaService.sendTodoMq(one1);
         }
     }
 

src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptApplayBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.standardRead;
 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;
@@ -15,6 +16,8 @@ public class DeptApplayBefore 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());
@@ -24,6 +27,10 @@ public class DeptApplayBefore implements TaskListener{
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzjdStep6?prcType=9");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/standardRead/DeptZrBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.standardRead;
 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;
@@ -15,6 +16,8 @@ public class DeptZrBefore 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());
@@ -24,6 +27,10 @@ public class DeptZrBefore implements TaskListener{
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzjdStep2?prcType=9");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/standardRead/EngineerApplayBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.standardRead;
 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;
@@ -15,6 +16,8 @@ public class EngineerApplayBefore 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());
@@ -24,6 +27,10 @@ public class EngineerApplayBefore implements TaskListener{
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzjdStep5?prcType=9");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/standardRead/ExpainBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.standardRead;
 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;
@@ -15,6 +16,8 @@ public class ExpainBefore 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());
@@ -24,6 +27,10 @@ public class ExpainBefore implements TaskListener{
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzjdStep3?prcType=9");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/standardRead/ZrApplayBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.standardRead;
 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;
@@ -15,6 +16,8 @@ public class ZrApplayBefore 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());
@@ -24,6 +27,10 @@ public class ZrApplayBefore implements TaskListener{
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzjdStep4?prcType=9");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/CountersignSRPBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.standardRegulatoryProcess;
 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;
@@ -25,6 +26,11 @@ public class CountersignSRPBefore implements TaskListener{
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzqdfbStep2?prcType=4");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPApplyApplicantBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.standardRegulatoryProcess;
 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;
@@ -25,6 +26,11 @@ public class SRPApplyApplicantBefore implements TaskListener{
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzqdfbStep3?prcType=4");
+            oaService.sendTodoMq(one1);
         }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/standardRegulatoryProcess/SRPManagerApproveBefore.java

@@ -3,6 +3,7 @@ package com.ydw.bat.wkflow.listener.standardRegulatoryProcess;
 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;
@@ -25,6 +26,11 @@ public class SRPManagerApproveBefore implements TaskListener{
             BusProcessNew one1 = list.get(0);
             one1.setTaskId(delegateTask.getId());
             busBean.saveOrUpdate(one1);
+
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzqdfbStep4?prcType=4");
+            oaService.sendTodoMq(one1);
         }
     }
 }