Merge remote-tracking branch 'origin/develop' into develop

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

@@ -31,7 +31,7 @@ public class UploadResearchResultBefore  implements TaskListener {
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
             JSONObject object =  JSONObject.parseObject(one1.getMesg());
-            one1.setLink("bzzqyjStep3?prcType=3&routerType=oa");
+            one1.setLink("bzzqyjStep3?prcType=3");
             one1.setTaskInfo(delegateTask.getName());
             // 干活节点流程
             one1.setTaskStatus(2);

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step2Before.java

@@ -28,7 +28,7 @@ public class Step2Before implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("bzpgStep2?prcType=5");
+            one1.setLink("bzpgStep2?prcType=5&routerType=oa");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step3Before.java

@@ -28,7 +28,7 @@ public class Step3Before implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpgStep6?prcType=5");
+            one1.setLink("xmpgStep6?prcType=5&routerType=oa");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step4Before.java

@@ -28,7 +28,7 @@ public class Step4Before implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpgStep6?prcType=5");
+            one1.setLink("xmpgStep6?prcType=5&routerType=oa");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step5Before.java

@@ -28,7 +28,7 @@ public class Step5Before implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpgStep6?prcType=5");
+            one1.setLink("xmpgStep6?prcType=5&routerType=oa");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step6Before.java

@@ -28,7 +28,7 @@ public class Step6Before implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpgStep6?prcType=5");
+            one1.setLink("xmpgStep6?prcType=5&routerType=oa");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step7Before.java

@@ -28,7 +28,7 @@ public class Step7Before implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpgStep6?prcType=5");
+            one1.setLink("xmpgStep6?prcType=5&routerType=oa");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step8Before.java

@@ -28,7 +28,7 @@ public class Step8Before implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpgStep6?prcType=5");
+            one1.setLink("xmpgStep6?prcType=5&routerType=oa");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }

src/main/java/com/ydw/bat/wkflow/listener/projectEvaluationNewProcess/Step9Before.java

@@ -28,7 +28,7 @@ public class Step9Before implements TaskListener {
             busBean.saveOrUpdate(one1);
 
             // 发送 oa 待办 设置 跳转页面 router ? 后面流程类型
-            one1.setLink("xmpgStep6?prcType=5");
+            one1.setLink("xmpgStep6?prcType=5&routerType=oa");
             one1.setTaskInfo(delegateTask.getName());
             oaService.sendTodoMq(one1);
         }