From d3298dadf1b7c987ba622a8b94c4a0f9ff453ac0 Mon Sep 17 00:00:00 2001
From: dimengzhe <251008545@qq.com>
Date: Tue, 23 Aug 2022 14:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BaseOutsourcingApplicationService.java         | 14 ++++++++------
 .../BaseVehicleActualSalesService.java             |  9 ++++++---
 .../biz/busmaindeposit/BusMainDepositService.java  |  8 +++++---
 .../biz/bussalesorder/BusSalesOrderService.java    |  9 ++++++---
 .../ScmVehicleGressionService.java                 |  9 ++++++---
 5 files changed, 31 insertions(+), 18 deletions(-)

diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
index 6b5e7e19fa..5f4f4bcf86 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseoutsourcingapplication/BaseOutsourcingApplicationService.java
@@ -503,13 +503,15 @@ public class BaseOutsourcingApplicationService extends MybatisBaseService<BaseOu
                         return rb.setMsg("验车单业务模块的数据推送失败!");
                     }
                 }
+            }else{
+                //======================添加消息推送开始
+                UpdateFlowFieldVo uff = rb.getData();
+                BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(bv.getBusinessSid());
+                //极光推送
+                String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
+                //======================添加消息推送结束
             }
-            //======================添加消息推送开始
-            UpdateFlowFieldVo uff = rb.getData();
-            BaseOutsourcingApplication baseOutsourcingApplication = fetchBySid(bv.getBusinessSid());
-            //极光推送
-            String msgSid = getMessage(uff, appMap, baseOutsourcingApplication);
-            //======================添加消息推送结束
+
             return rb;
         } else {
             return ResultBean.fireFail().setMsg("操作失败，提交的数据不一致!");
diff --git a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
index 4e45784ced..7976fb8bbe 100644
--- a/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
+++ b/anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java
@@ -384,9 +384,12 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             }
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
-            //极光推送
-            baseVehicleActualSales = fetchBySid(bv.getBusinessSid());
-            String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales);
+            if(!"Event_end".equals(ufVo.getTaskDefKey())){
+                //极光推送
+                baseVehicleActualSales = fetchBySid(bv.getBusinessSid());
+                String msgSid = getMessage(ufVo, appMap, baseVehicleActualSales);
+            }
+
             return rb.success().setData(resultBean.getData());
         } else {
             return rb.setMsg("操作失败!提交的数据不一致");
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
index 303edfb6e4..c38e798d29 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java
@@ -1919,9 +1919,11 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             }
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
-            //极光推送
-            busMainDeposit = fetchBySid(bv.getBusinessSid());
-            String msgSid = getMessage(ufVo, appMap, busMainDeposit);
+            if(!"Event_end".equals(ufVo.getTaskDefKey())){
+                //极光推送
+                busMainDeposit = fetchBySid(bv.getBusinessSid());
+                String msgSid = getMessage(ufVo, appMap, busMainDeposit);
+            }
             return rb.success().setData(resultBean.getData());
         } else {
             return rb.setMsg("操作失败!提交的数据不一致");
diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
index 391f9e1905..e0bba8fd0b 100644
--- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
+++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
@@ -909,9 +909,12 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
                 //更新业务中的流程相关的参数
                 updateFlowFiled(map);
-                //极光推送
-                busSalesOrder = fetchBySid(query.getBusinessSid());
-                String msgSid = getMessage(ufVo, (Map<String, Object>) variables.get("app"), busSalesOrder);
+                if(!"Event_end".equals(ufVo.getTaskDefKey())){
+                    //极光推送
+                    busSalesOrder = fetchBySid(query.getBusinessSid());
+                    String msgSid = getMessage(ufVo, (Map<String, Object>) variables.get("app"), busSalesOrder);
+                }
+
                 return rb.success();
             }
         }
diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
index 9af41c1ee8..bb332b4f4c 100644
--- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
+++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java
@@ -746,9 +746,12 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             }
             UpdateFlowFieldVo ufVo = resultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(resultBean.getData()));
-            //极光推送
-            scmVehicleGression = fetchBySid(bv.getBusinessSid());
-            String msgSid = getMessage(ufVo, appMap, scmVehicleGression);
+            if(!"Event_end".equals(ufVo.getTaskDefKey())){
+                //极光推送
+                scmVehicleGression = fetchBySid(bv.getBusinessSid());
+                String msgSid = getMessage(ufVo, appMap, scmVehicleGression);
+            }
+
             return rb.success().setData(resultBean.getData());
         } else {
             return rb.setMsg("操作失败!提交的数据不一致");