From efb51ebdd78a989c976a410b1ac6b18753929a68 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 6 Mar 2024 16:14:47 +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 | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/doc/databases/统计报表更新.sql b/doc/databases/统计报表更新.sql
index 73b962fe7d..60fa3df14a 100644
--- a/doc/databases/统计报表更新.sql
+++ b/doc/databases/统计报表更新.sql
@@ -283,7 +283,7 @@ BEGIN
      WHERE DATE_FORMAT(createTime, '%Y-%m-%d') = CURDATE();*/
 
     UPDATE daily_report r
-        INNER JOIN (select (b.scount - b.ssscount) as scount, b.useOrgSid, b.modelConfigSid, b.modelSid
+        INNER JOIN (select (b.scount - b.ssscount-b.ssscount1) as scount, b.useOrgSid, b.modelConfigSid, b.modelSid
                     from (SELECT a.scount,
                                  a.useOrgSid,
                                  a.modelConfigSid,
@@ -293,11 +293,23 @@ BEGIN
                                            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'
+                                    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
+                                    and bm.modelConfigSid = a.modelConfigSid) as ssscount,
+                                 (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 bs.busState = '602'
+                                    and bo.useOrgSid = a.useOrgSid
+                                    and bm.modelSid = a.modelSid
+                                    and bm.modelConfigSid = a.modelConfigSid) as ssscount1
                           FROM (
                                    SELECT count(bov.id) AS scount,
                                           bo.useOrgSid,