From 07c31c1d0ef209c730c2d801cff1a528803f26b8 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 6 Mar 2024 18:46:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=BE=85=E4=BA=A4=E8=BD=A6?=
 =?UTF-8?q?=E7=B4=AF=E8=AE=A1=E5=8E=BB=E9=99=A4=E5=B7=B2=E9=80=80=E8=BD=A6?=
 =?UTF-8?q?=E7=9A=84=E8=BD=A6=E8=BE=86=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/databases/统计报表更新.sql              | 15 ++-------------
 .../main/java/com/yxt/anrui/as/AsApplication.java |  2 +-
 2 files changed, 3 insertions(+), 14 deletions(-)

diff --git a/doc/databases/统计报表更新.sql b/doc/databases/统计报表更新.sql
index 07e85b301c..d789c7e3b5 100644
--- a/doc/databases/统计报表更新.sql
+++ b/doc/databases/统计报表更新.sql
@@ -283,29 +283,18 @@ BEGIN
      WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();*/
 
     UPDATE daily_report r
-        INNER JOIN (select (b.scount - b.ssscount-b.ssscount1) as scount, b.useOrgSid, b.modelConfigSid, b.modelSid
+        INNER JOIN (select (b.scount -b.ssscount1) as scount, b.useOrgSid, b.modelConfigSid, b.modelSid
                     from (SELECT a.scount,
                                  a.useOrgSid,
                                  a.modelConfigSid,
                                  a.modelSid,
-                                 (SELECT count(bov.id) AS scount
-                                  FROM anrui_base.base_vehicle bv
-                                           LEFT JOIN anrui_buscenter.bus_sales_order_vehicle bov ON bov.linkSid = bv.sid
-                                           LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bov.salesOrderSid
-                                           LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
-                                 left join anrui_base.base_vehicle_state bs on bs.busSid = bov.sid
-                                  WHERE bo.nodeState = '已办结'
-                                    AND (bv.vehicleState = '0002' or bs.busNo = '602')
-                                    and bo.useOrgSid = a.useOrgSid
-                                    and bm.modelSid = a.modelSid
-                                    and bm.modelConfigSid = a.modelConfigSid) as ssscount,
                                  (SELECT count(bov.id) AS scount
                                            from anrui_buscenter.bus_sales_order_vehicle bov
                                            LEFT JOIN anrui_buscenter.bus_sales_order bo ON bo.sid = bov.salesOrderSid
                                            LEFT JOIN anrui_buscenter.bus_sales_order_model bm ON bm.salesOrderSid = bo.sid
                                            left join anrui_base.base_vehicle_state bs on bs.busSid = bov.sid
                                   WHERE bo.nodeState = '已办结'
-                                    AND bs.busState = '602'
+                                    AND (bs.busState = '602' or bs.busState = '501' or bs.busState = '502' or bs.busState = '503' or bs.busState = '601' or bs.busState = '602')
                                     and bo.useOrgSid = a.useOrgSid
                                     and bm.modelSid = a.modelSid
                                     and bm.modelConfigSid = a.modelConfigSid) as ssscount1
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/AsApplication.java b/yxt-as/src/main/java/com/yxt/anrui/as/AsApplication.java
index f5268694aa..039141916e 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/AsApplication.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/AsApplication.java
@@ -13,7 +13,7 @@ import org.springframework.cloud.openfeign.EnableFeignClients;
         "com.yxt.common.base.config",
         "com.yxt.anrui.as"
 })
-@EnableFeignClients(basePackages = {"com.yxt.anrui.*",})
+@EnableFeignClients(basePackages = {"com.yxt.anrui.*"})
 public class AsApplication {
     public static void main(String[] args) {
         SpringApplication.run(AsApplication.class, args);