政策课题组参会流程---代码修改

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalAfter.java

@@ -41,11 +41,13 @@ public class MinisterApprovalAfter implements TaskListener {
         if("1".equals(object.getString("fgfbz"))){
             delegateTask.setVariable("fgfbz", "1");
             if (StringUtils.isNotBlank(object.getString("presidentId"))){
+                nextUserList.add(object.getString("presidentId"));
                 delegateTask.setVariable("presidentApproval", object.getString("presidentId"));
             }
         }else if ("0".equals(object.getString("fgfbz"))){
             delegateTask.setVariable("fgfbz", "0");
             if (StringUtils.isNotBlank(object.getString("revisionId"))){
+                nextUserList.add(object.getString("revisionId"));
                 delegateTask.setVariable("revision", object.getString("revisionId"));
             }
         }else{

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/MinisterApprovalBefore.java

@@ -1,11 +1,34 @@
 package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting;
 
+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;
 
+import java.util.List;
+
 public class MinisterApprovalBefore 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());
+        queryWrapper1.isNull("TASK_ID");
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            busBean.saveOrUpdate(one1);
 
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("policyResearchGroupEnrollment2?prcType=18");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PRGAMStartAfter.java

@@ -39,6 +39,7 @@ public class PRGAMStartAfter implements TaskListener {
         List<String> nextUserList = new ArrayList();
         if(StringUtils.isNotBlank(object.getString("ministerId"))){
             delegateTask.setVariable("ministerApproval", object.getString("ministerId"));
+            nextUserList.add(object.getString("ministerId"));
         }
 
         //截止时间 流程描述 创建人

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalAfter.java

@@ -42,6 +42,7 @@ public class PresidentApprovalAfter implements TaskListener {
         }else{
             delegateTask.setVariable("gsfz", "0");
             if (StringUtils.isNotBlank(object.getString("revisionId"))){
+                nextUserList.add(object.getString("revisionId"));
                 delegateTask.setVariable("revision", object.getString("revisionId"));
             }
         }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/PresidentApprovalBefore.java

@@ -1,11 +1,34 @@
 package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting;
 
+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;
 
+import java.util.List;
+
 public class PresidentApprovalBefore 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());
+        queryWrapper1.isNull("TASK_ID");
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            busBean.saveOrUpdate(one1);
 
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("policyResearchGroupEnrollment2?prcType=18");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
     }
 }

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationAfter.java

@@ -39,6 +39,7 @@ public class RevisionInformationAfter implements TaskListener {
         List<String> nextUserList = new ArrayList();
 
         if (StringUtils.isNotBlank(object.getString("ministerId"))){
+            nextUserList.add(object.getString("ministerId"));
             delegateTask.setVariable("ministerApproval", object.getString("ministerId"));
         }
 
@@ -70,18 +71,7 @@ public class RevisionInformationAfter implements TaskListener {
         }
         // 存储当前节点意见
         // 存储当前节点意见
-        if (null!=object.getString("commentText")) {
+
-            QueryWrapper queryWrapper3 = new QueryWrapper();
-            queryWrapper3.eq("TASK_ID", delegateTask.getId());
-            queryWrapper3.eq("USER_ID",delegateTask.getAssignee());
-            List<BusProcessNew> list = busBean.list(queryWrapper3);
-            if(!list.isEmpty()){
-                BusProcessNew busProcessNews = list.get(0);
-                busProcessNews.setTaskId(delegateTask.getId());
-                busProcessNews.setCommitText(object.getString("commentText"));
-                busBean.saveOrUpdate(busProcessNews);
-            }
-        }
         if(nextUserList != null && !nextUserList.isEmpty()){
             for(String nextUser : nextUserList){
                 BusProcessNew busProcessNewNext = new BusProcessNew();

src/main/java/com/ydw/bat/wkflow/listener/policyResearchGroupAttendMeeting/RevisionInformationBefore.java

@@ -1,11 +1,34 @@
 package com.ydw.bat.wkflow.listener.policyResearchGroupAttendMeeting;
 
+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;
 
+import java.util.List;
+
 public class RevisionInformationBefore 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());
+        queryWrapper1.isNull("TASK_ID");
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            busBean.saveOrUpdate(one1);
 
+            CreateMQService oaService = SpringContextUtil.getBean(CreateMQService.class);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("policyResearchGroupEnrollment2?prcType=18");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
     }
 }