优化待交车累计去除已退车的车辆数量

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,