diff --git a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java
index 08364c7f..e35459f9 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_activiti/task/TaskController.java
@@ -168,4 +168,4 @@ public class TaskController {
 		}
 		return list;
 	}
-}
\ No newline at end of file
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java
index 1a488b10..b1f8ea9e 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/CreateMQService.java
@@ -42,7 +42,7 @@ public class CreateMQService {
 
         if(oaFlag){
             //发送消息队列
-            this.rabbitTemplate.convertAndSend("sendDone-exchange_MQ_GSAR", "sendDone-key_MQ_GSAR", object);
+            this.rabbitTemplate.convertAndSend("sendDone-exchange_MQ_GSAR_RELEASE", "sendDone-key_MQ_GSAR_RELEASE", object);
 
         }
     }
@@ -55,7 +55,7 @@ public class CreateMQService {
 
         if(oaFlag) {
             //发送消息队列
-            this.rabbitTemplate.convertAndSend("send-exchange_MQ_GSAR", "send-key_MQ_GSAR", object);
+            this.rabbitTemplate.convertAndSend("send-exchange_MQ_GSAR_RELEASE", "send-key_MQ_GSAR_RELEASE", object);
         }
     }
 
diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java
index aa16152b..59cabdfc 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendDoneMQService.java
@@ -50,9 +50,9 @@ public class SendDoneMQService {
     private LawsUserInfoService lawsUserInfoService;
 
     @RabbitListener(bindings = @QueueBinding(
-            value = @Queue(value = "createMQDone_SQ_GSAR", durable = "true"),
-            exchange = @Exchange(value = "sendDone-exchange_MQ_GSAR", ignoreDeclarationExceptions = "true"),
-            key = "sendDone-key_MQ_GSAR"))
+            value = @Queue(value = "createMQDone_SQ_GSAR_RELEASE", durable = "true"),
+            exchange = @Exchange(value = "sendDone-exchange_MQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"),
+            key = "sendDone-key_MQ_GSAR_RELEASE"))
     public void createMQDone(NotifyTodoSendContext object, Message message, Channel channel) throws Exception{
         try{
             try{
diff --git a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java
index 46eaff1b..1333bc26 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_mq/service/SendMQService.java
@@ -56,9 +56,9 @@ public class SendMQService {
     private LawsUserInfoService lawsUserInfoService;
 
     @RabbitListener(bindings = @QueueBinding(
-            value = @Queue(value = "createMQ_SQ_GSAR", durable = "true"),
-            exchange = @Exchange(value = "send-exchange_MQ_GSAR", ignoreDeclarationExceptions = "true"),
-            key = "send-key_MQ_GSAR"))
+            value = @Queue(value = "createMQ_SQ_GSAR_RELEASE", durable = "true"),
+            exchange = @Exchange(value = "send-exchange_MQ_GSAR_RELEASE", ignoreDeclarationExceptions = "true"),
+            key = "send-key_MQ_GSAR_RELEASE"))
     public void createMQ(BusProcessNew object, Message message, Channel channel) throws Exception{
         try{
             try{
diff --git a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java
index f7ba0e41..f7a6d134 100644
--- a/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java
+++ b/src/main/java/com/ydw/bat/wkflow/business_oa/webService/service/impl/WebServiceOAServiceImpl.java
@@ -49,7 +49,7 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
     private String errMes = "异常信息:";
 
     private String api_key = "OA";
-    private String api_secret = "TEST_oa201611241710";
+    private String api_secret = "oa201611241710";
 
     @Value("${webUrl}")
     private String webUrl;
@@ -296,7 +296,7 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
         head.setBIZTRANSACTIONID("SYC_161320210206133219");
         head.setCONSUMER("SRMS");
         head.setCOUNT("1");
-        head.setPASSWORD("TEST_oa201611241710");
+        head.setPASSWORD("oa201611241710");
         head.setSRVLEVEL("1");
         List<Object> list = new ArrayList<>();
         list.add(notifyTodoSendContext);
@@ -306,7 +306,7 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
         Map<String,String> mapCtr = new TreeMap<>();
         mapCtr.put("Authorization",credentials);
         log.info("处理完文件数据，开始请求发送已办接口数据：【"+sdf.format(new Date())+"】");
-        result = okHttpUtil.postForJson("http://172.24.12.64:85/WP_FOTON_FSOA/APP_DOC_SERVICES/Proxy_Services/TA_OA/DOC_SYC_1021_SendNotifyTodo_PS",json.toString(),mapCtr);
+        result = okHttpUtil.postForJson("https://fesbnew.foton.com.cn/WP_FOTON_FSOA/APP_DOC_SERVICES/Proxy_Services/TA_OA/DOC_SYC_1021_SendNotifyTodo_PS",json.toString(),mapCtr);
         log.info("请求发送已办接口完毕，返回响应状态：【"+sdf.format(new Date())+"】");
 //            JSONObject jsonObject = JSONObject.parseObject(result);
         if(!result.contains("操作成功")){
@@ -339,7 +339,7 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
         head.setBIZTRANSACTIONID("SYC_161320210206133219");
         head.setCONSUMER("SRMS");
         head.setCOUNT("1");
-        head.setPASSWORD("TEST_oa201611241710");
+        head.setPASSWORD("oa201611241710");
         head.setSRVLEVEL("1");
         List<Object> list = new ArrayList<>();
         NotifyTodoSendContext notifyTodoSendContext = new NotifyTodoSendContext();
@@ -374,7 +374,7 @@ public class WebServiceOAServiceImpl  implements WebServiceOAService {
         Map<String,String> mapCtr = new TreeMap<>();
         mapCtr.put("Authorization",credentials);
         log.info("处理完文件数据，开始请求发送待办接口数据：【"+sdf.format(new Date())+"】");
-        result = okHttpUtil.postForJson("http://172.24.12.64:85/WP_FOTON_FSOA/APP_DOC_SERVICES/Proxy_Services/TA_OA/DOC_SYC_1019_SendTodo_PS",json.toString(),mapCtr);
+        result = okHttpUtil.postForJson("https://fesbnew.foton.com.cn/WP_FOTON_FSOA/APP_DOC_SERVICES/Proxy_Services/TA_OA/DOC_SYC_1019_SendTodo_PS",json.toString(),mapCtr);
         log.info("请求发送待办接口完毕，返回响应状态：【"+sdf.format(new Date())+"】");
 //            JSONObject jsonObject = JSONObject.parseObject(result);
         if(!result.contains("操作成功")){
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubMinisterReviewAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubMinisterReviewAfter.java
index 79d68d6b..5d808db6 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubMinisterReviewAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubMinisterReviewAfter.java
@@ -61,7 +61,7 @@ public class SubMinisterReviewAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "重点认证标准/政策合规性项目审查流程-法规认证副总监批准";
+        String prcName = "重点认证标准/政策合规性项目审查流程-法规认证副总监审定";
         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/StandardSurvey/UploadResearchResultBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultBefore.java
index b94457a1..ce7d7152 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultBefore.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/StandardSurvey/UploadResearchResultBefore.java
@@ -31,7 +31,7 @@ public class UploadResearchResultBefore  implements TaskListener {
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             JSONObject object =  JSONObject.parseObject(one1.getMesg());
-            one1.setLink("bzdyStep3?prcType=2&routerType=oa");
+            one1.setLink("bzdyStep3?prcType=2");
             one1.setTaskInfo(delegateTask.getName());
             // 干活节点流程
             one1.setTaskStatus(2);
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java
index cbe13f17..186b5e0b 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/bussLibrary/BussUtils.java
@@ -57,7 +57,6 @@ public class BussUtils {
             one1.setMsgType("clause");
             one1.setPId(delegateTask.getProcessInstanceId());
             one1.setMesg(object.toJSONString());
-            one1.setTaskInfo(delegateTask.getTaskDefinitionKey());
             one1.setFinishFlag("0");
             one1.setTaskInfo(delegateTask.getName());
             one1.setPrcName(prcName);
@@ -87,7 +86,6 @@ public class BussUtils {
             one1.setMsgType("clause");
             one1.setPId(delegateTask.getProcessInstanceId());
             one1.setMesg(object.toJSONString());
-            one1.setTaskInfo(delegateTask.getTaskDefinitionKey());
             one1.setFinishFlag("0");
             one1.setTaskInfo(delegateTask.getName());
             one1.setPrcName(prcName);
@@ -116,7 +114,6 @@ public class BussUtils {
         busProcessNew.setMsgType("clause");
         busProcessNew.setPId(delegateTask.getProcessInstanceId());
         busProcessNew.setMesg(object.toJSONString());
-        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
         busProcessNew.setTaskId(delegateTask.getId());
         busProcessNew.setCommitText(object.getString("commentText"));
         busProcessNew.setFinishFlag("0");
@@ -129,7 +126,6 @@ public class BussUtils {
                 busProcessNewNext.setMsgType("clause");
                 busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
                 busProcessNewNext.setMesg(object.toJSONString());
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
                 busProcessNewNext.setFinishFlag("0");
                 busProcessNewNext.setTaskInfo(delegateTask.getName());
                 busProcessNewNext.setUserId(nextUser);
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java
similarity index 73%
rename from src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java
rename to src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java
index 9526cf8c..af032498 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/KCSTPReviewProcess/SubViceDirectorAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorAfter.java
@@ -1,4 +1,4 @@
-package com.ydw.bat.wkflow.listener.KCSTPReviewProcess;
+package com.ydw.bat.wkflow.listener.policyCommentProcess;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,11 +18,10 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
-
 /**
- * 副总监审核
+ * 总监审核
  */
-public class SubViceDirectorAfter implements TaskListener {
+public class DirectorAfter implements TaskListener {
     @Override
     public void notify(DelegateTask delegateTask) {
         IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
@@ -36,27 +35,12 @@ public class SubViceDirectorAfter implements TaskListener {
         JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
         delegateTask.setVariable("objectJson",object);
 
-
-        /**
-         * next 结束
-         */
         List<String> nextUserList = new ArrayList();
+
+
+
         if ("0".equals(object.getString("actionFlag"))){
-            delegateTask.setVariable("lawsProveViceChiefVerify",0);
-
-            //流程结束
-            func2(delegateTask, busBean, object, "0", busProcessNameService);
-
-        }else {
-            //TODO 驳回
-            String startUser = object.getString("startUser");
-            delegateTask.setVariable("startUser",startUser);
-            nextUserList = Arrays.asList(startUser.split(","));
-
-
-            delegateTask.setVariable("lawsProveViceChiefVerify",1);
-
-
+            delegateTask.setVariable("lawsProveChiefVerify",0);
         }
 
 
@@ -66,13 +50,13 @@ public class SubViceDirectorAfter implements TaskListener {
         String username = object.getString("prcCreateUserName");
 //        object.getString("standName")
         String standName = "";
-        String prcName = "重点认证标准/政策合规性项目审查流程-责任部门领导任务下发";
+        String prcName = "政策征求意见流程";
         QueryWrapper queryWrapper2 = new QueryWrapper();
         queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
         BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
         if(one1!=null){
 //            one1.setOverTime(OVERTIME);
-            one1.setPrcType("laws3");
+            one1.setPrcType("1");
             one1.setPrcName(prcName);
             one1.setCreatUser(user);
             one1.setCreatUserName(username);
@@ -90,21 +74,10 @@ public class SubViceDirectorAfter implements TaskListener {
         busProcessNew.setFinishFlag("0");
         busProcessNew.setTaskInfo(delegateTask.getName());
         busBean.save(busProcessNew);
-
-        if(nextUserList != null && !nextUserList.isEmpty()){
-            for(String nextUser : nextUserList){
-                BusProcessNew busProcessNewNext = new BusProcessNew();
-                busProcessNewNext.setMsgType("clause");
-                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
-                busProcessNewNext.setMesg(object.toJSONString());
-                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
-                busProcessNewNext.setFinishFlag("0");
-                busProcessNewNext.setTaskInfo(delegateTask.getName());
-                busProcessNewNext.setUserId(nextUser);
-                busProcessNewNext.setPrcName(prcName);
-                busBean.save(busProcessNewNext);
-            }
+        if (object.getString("lawsProveChiefVerify")=="0"){
+            func2(delegateTask, busBean, object, "0", busProcessNameService);
         }
+
     }
 
     private String verifyObj(String str){
@@ -120,7 +93,7 @@ public class SubViceDirectorAfter implements TaskListener {
         if (one2 != null) {
             //one2.setPrcName("入库流程结束");
             one2.setOverTime(OVERTIME);
-            one2.setPrcType("laws3");
+            one2.setPrcType("laws2");
             busProcessNameService.saveOrUpdate(one2);
         }
 
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorBefore.java
new file mode 100644
index 00000000..69a66eb9
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DirectorBefore.java
@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.policyCommentProcess;
+
+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 DirectorBefore 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());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=laws2");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionBefore.java
new file mode 100644
index 00000000..c4142677
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DistributionBefore.java
@@ -0,0 +1,39 @@
+package com.ydw.bat.wkflow.listener.policyCommentProcess;
+
+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 DistributionBefore 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());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=laws2");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewBefore.java
new file mode 100644
index 00000000..5c2a65c9
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/DockerReviewBefore.java
@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.policyCommentProcess;
+
+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 DockerReviewBefore 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());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=laws2");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewBefore.java
new file mode 100644
index 00000000..8e2fffc2
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerReviewBefore.java
@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.policyCommentProcess;
+
+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 EngineerReviewBefore 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());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=laws2");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java
index 768b0e5c..3026f420 100644
--- a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java
+++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/EngineerRevisionAfter.java
@@ -40,12 +40,12 @@ public class EngineerRevisionAfter implements TaskListener {
 
         JSONObject form = JSONObject.parseObject(object.getString("form"));
         String lawsProveMinister = JSONObject.parseObject(form.getString("form")).getString("lawsProveMinisterId");
-            if(StringUtils.isNotBlank(lawsProveMinister)){
+        if(StringUtils.isNotBlank(lawsProveMinister)){
 
-                delegateTask.setVariable("lawsProveMinisterId",lawsProveMinister);
-                nextUserList= Arrays.asList(lawsProveMinister.split(","));
-                delegateTask.addCandidateUsers(nextUserList);
-            }
+            delegateTask.setVariable("lawsProveMinisterId",lawsProveMinister);
+            nextUserList= Arrays.asList(lawsProveMinister.split(","));
+            delegateTask.addCandidateUsers(nextUserList);
+        }
 
 
         //截止时间 流程描述 创建人
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentBefore.java
new file mode 100644
index 00000000..a83486c6
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/FillCommentBefore.java
@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.policyCommentProcess;
+
+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 FillCommentBefore 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());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=laws2");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java
new file mode 100644
index 00000000..b7eedeca
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchAfter.java
@@ -0,0 +1,96 @@
+package com.ydw.bat.wkflow.listener.policyCommentProcess;
+
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessName;
+import com.ydw.bat.wkflow.business_main.datas.entity.BusProcessNew;
+import com.ydw.bat.wkflow.business_main.datas.entity.Datas;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNameService;
+import com.ydw.bat.wkflow.business_main.datas.service.IBusProcessNewService;
+import com.ydw.bat.wkflow.business_main.datas.service.IDatasService;
+import com.ydw.bat.wkflow.util.SpringContextUtil;
+import org.activiti.engine.ActivitiException;
+import org.activiti.engine.delegate.DelegateTask;
+import org.activiti.engine.delegate.TaskListener;
+import org.apache.commons.lang.StringUtils;
+
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Date;
+import java.util.List;
+
+public class LaunchAfter implements TaskListener {
+    @Override
+    public void notify(DelegateTask delegateTask) {
+        IDatasService datasService = SpringContextUtil.getBean(IDatasService.class);
+        IBusProcessNewService busBean = SpringContextUtil.getBean(IBusProcessNewService.class);
+        IBusProcessNameService busProcessNameService = SpringContextUtil.getBean(IBusProcessNameService.class);
+
+        QueryWrapper<Datas> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("ACTI_TASK_ID", delegateTask.getId());
+        Datas datas = datasService.getOne(queryWrapper);
+
+        JSONObject object =  JSONObject.parseObject(datas.getFormValsJson());
+        delegateTask.setVariable("objectJson",object);
+
+        List<String> nextUserList = new ArrayList();
+
+        if(StringUtils.isNotBlank(object.getString("responseDockerId"))){
+            nextUserList= Arrays.asList(object.getString("responseDockerId").split(","));
+            // 配置多实例
+            delegateTask.setVariable("counterpartUserList",nextUserList);
+            delegateTask.addCandidateUsers(nextUserList);
+        }
+
+        //截止时间 流程描述 创建人
+        String OVERTIME = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
+        String user = object.getString("prcCreateUser");
+        String username = object.getString("prcCreateUserName");
+//        object.getString("standName")
+        String standName = "";
+        String prcName = "政策征求意见流程-任务分发";
+        QueryWrapper queryWrapper2 = new QueryWrapper();
+        queryWrapper2.eq("PRC_ID",delegateTask.getProcessInstanceId());
+        BusProcessName one1 = busProcessNameService.getOne(queryWrapper2);
+        if(one1!=null){
+//            one1.setOverTime(OVERTIME);
+            one1.setPrcType("laws2");
+            one1.setPrcName(prcName);
+            one1.setCreatUser(user);
+            one1.setCreatUserName(username);
+            busProcessNameService.saveOrUpdate(one1);
+        }
+
+        // 存储当前节点意见
+        BusProcessNew busProcessNew = new BusProcessNew();
+        busProcessNew.setMsgType("clause");
+        busProcessNew.setPId(delegateTask.getProcessInstanceId());
+        busProcessNew.setMesg(object.toJSONString());
+        busProcessNew.setTaskInfo(delegateTask.getTaskDefinitionKey());
+        busProcessNew.setTaskId(delegateTask.getId());
+        busProcessNew.setCommitText(object.getString("commentText"));
+        busProcessNew.setFinishFlag("0");
+        busProcessNew.setTaskInfo(delegateTask.getName());
+        busBean.save(busProcessNew);
+
+        if(nextUserList != null && !nextUserList.isEmpty()){
+            for(String nextUser : nextUserList){
+                BusProcessNew busProcessNewNext = new BusProcessNew();
+                busProcessNewNext.setMsgType("clause");
+                busProcessNewNext.setPId(delegateTask.getProcessInstanceId());
+                busProcessNewNext.setMesg(object.toJSONString());
+                busProcessNewNext.setTaskInfo(delegateTask.getTaskDefinitionKey());
+                busProcessNewNext.setFinishFlag("0");
+                busProcessNewNext.setTaskInfo(delegateTask.getName());
+                busProcessNewNext.setUserId(nextUser);
+                busProcessNewNext.setPrcName(prcName);
+                busBean.save(busProcessNewNext);
+            }
+        }
+    }
+
+    private String verifyObj(String str){
+        return (str == null || str.equals("")) ? "" : str;
+    }
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchBefore.java
new file mode 100644
index 00000000..3ea9b1eb
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/LaunchBefore.java
@@ -0,0 +1,36 @@
+package com.ydw.bat.wkflow.listener.policyCommentProcess;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.netflix.eureka.util.batcher.TaskDispatcher;
+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 LaunchBefore 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());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=laws2");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewBefore.java
new file mode 100644
index 00000000..6a4d6f82
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/MinisterReviewBefore.java
@@ -0,0 +1,37 @@
+package com.ydw.bat.wkflow.listener.policyCommentProcess;
+
+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 MinisterReviewBefore 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());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            one1.setLink("bzrkStep2?prcType=laws2");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}
diff --git a/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorBefore.java b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorBefore.java
new file mode 100644
index 00000000..7f1b2f9f
--- /dev/null
+++ b/src/main/java/com/ydw/bat/wkflow/listener/policyCommentProcess/ViceDirectorBefore.java
@@ -0,0 +1,39 @@
+package com.ydw.bat.wkflow.listener.policyCommentProcess;
+
+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;
+/**
+ * 副总监审核
+ * @author 22501
+ */
+public class ViceDirectorBefore 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());
+        List<BusProcessNew> list = busBean.list(queryWrapper1);
+        if(!list.isEmpty()){
+            BusProcessNew one1 = list.get(0);
+            one1.setTaskId(delegateTask.getId());
+            one1.setTaskInfo(delegateTask.getName());
+            busBean.saveOrUpdate(one1);
+            // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
+            //TODO 设置路由
+            one1.setLink("bzrkStep2?prcType=laws2");
+            one1.setTaskInfo(delegateTask.getName());
+            oaService.sendTodoMq(one1);
+        }
+    }
+}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 6a31255a..a75a413b 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,7 +1,7 @@
 wkfow:
   auth: fk-auth
 server:
-  port: 17211
+  port: 4203
   tomcat:
     uri-encoding: UTF-8
   servlet:
@@ -15,7 +15,9 @@ logging:
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://62.234.136.153:8761/eureka/
+      defaultZone: http://10.100.5.117:4201/eureka/
+  instance:
+    prefer-ip-address: true
 spring:
   application:
     name: bat-wkflow
@@ -31,12 +33,9 @@ spring:
   datasource:
     type: com.alibaba.druid.pool.DruidDataSource
     driver-class-name: com.mysql.cj.jdbc.Driver
-    url: jdbc:mysql://123.56.177.15:3306/foton-bat-wkflow?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8
-    username: root
-    password: RsLDRj3dXtSwYjBI
-#    url: jdbc:mysql://127.0.0.1:3306/foton-bat-wkflow?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8
-#    username: root
-#    password: root
+    url: jdbc:mysql://10.100.5.111:3306/foton_bat_wkflow?nullCatalogMeansCurrent=true&serverTimezone=Asia/Shanghai&useSSL=false&characterEncoding=utf-8
+    username: tempuser
+    password: Fting&8g35g#geg2
   activiti:
     database-schema-update: true
     # 自动部署验证设置:true-开启（默认）、false-关闭
@@ -45,14 +44,14 @@ spring:
     active: dev
   # 相关服务配置同业务系统
   rabbitmq:
-    host: 62.234.136.153
+    host: 10.100.5.119
     port: 5672
-    username: guest
-    password: guest
+    username: admin
+    password: foton@admin
     listener:
       direct:
         # 默认加载 发版 需改为 true
-        auto-startup: false
+        auto-startup: true
       simple:
         concurrency: 5
         max-concurrency: 10
@@ -66,7 +65,7 @@ spring:
           #最大重试9次
           max-attempts: 6
         # 消费者默认加载 发版 需改为 true
-        auto-startup: false
+        auto-startup: true
 
   # =============================================================================
   # 邮箱配置-1
@@ -103,20 +102,10 @@ ribbon:
 
 # 配置 是否 启用 OA
 oa:
-  flag: false
+  flag: true
 
 # 配置前端服务全路径地址 如下 /#/
-webUrl: http://62.234.136.153:8038/#/
+webUrl: https://srms.foton.com.cn/#/
 
-# OA 接受任务定时器是否启用
-isNotScheduled: false
-
-buss:
-  edit:
-    file:
-      path: /data/slrs/file/
-  down:
-    file:
-#      path: https://srms.foton.com.cn/file/
-      path: http://foton.natapp1.cc/file/
+isNotScheduled: true