From 2db75a4a480b626999d62a209bfaf5e8de752f34 Mon Sep 17 00:00:00 2001
From: dimengzhe <dimengzhe>
Date: Wed, 3 Apr 2024 16:08:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/databases/统计报表更新.sql | 37 +++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/doc/databases/统计报表更新.sql b/doc/databases/统计报表更新.sql
index 671fa2a033..0ab6399b90 100644
--- a/doc/databases/统计报表更新.sql
+++ b/doc/databases/统计报表更新.sql
@@ -78,7 +78,10 @@ BEGIN
                      where (si.nodeState != '已办结' and si.nodeState != '终止')
                        and bo.isDelete <> 1
                        and bo.applyTypeKey = '001'
-                       and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
+                       and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo  LEFT JOIN anrui_buscenter.bus_sales_order bb ON bb.sid = bbbbo.salesOrderSid
+                                          WHERE LENGTH(bb.nodeState) > 0
+                                            AND bb.nodeState != '终止' and bb.nodeState != '销售订单申请'
+                                          group by bbbbo.linkSid)
                      group by si.applicationCode, bo.createOrgSid, si.modelSid, si.configSid
                      union all
                      select ifnull(sum(bo.platformNo), 0) as scount,
@@ -93,7 +96,11 @@ BEGIN
                      where bo.isDelete <> 1
                        and LENGTH(offlineDate) = 0
                        and bo.orderStatus != '已作废'
-                       and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo)
+                       and bo.sid not in (select bbbbo.linkSid from anrui_buscenter.bus_sales_vehicle_order bbbbo
+                                                                        LEFT JOIN anrui_buscenter.bus_sales_order bb ON bb.sid = bbbbo.salesOrderSid
+                                          WHERE LENGTH(bb.nodeState) > 0
+                                            AND bb.nodeState != '终止' and bb.nodeState != '销售订单申请'
+                                          group by bbbbo.linkSid)
                      group by bo.createOrgSid, bd.vehicleSid, bd.configSid
                      union all
                      select ifnull(si.num, 0) as scount,
@@ -136,12 +143,36 @@ BEGIN
                          FROM anrui_buscenter.bus_sales_vehicle_order bbbbo
                                   LEFT JOIN anrui_buscenter.bus_sales_order bb ON bb.sid = bbbbo.salesOrderSid
                          WHERE LENGTH(bb.nodeState) > 0
-                           AND bb.nodeState != '终止'
+                           AND bb.nodeState != '终止' and bb.nodeState != '销售订单申请'
                          group by bbbbo.linkSid
                      ) ab ON ab.linkSid = bo.sid
                      WHERE (si.nodeState != '已办结' AND si.nodeState != '终止')
                        AND bo.isDelete <> 1
                      group by si.applicationCode, bo.createOrgSid, si.modelSid, si.configSid
+                     UNION ALL
+                     SELECT
+                         bo.useOrgSid,
+                         bd.vehicleSid modelSid,
+                         bd.configSid,
+                         bo.sid,
+                         ifnull(ab.counts, 0) as scount
+                     FROM
+                         anrui_base.bus_vehicle_order bo
+                             LEFT JOIN anrui_base.bus_vehicle_apply_detail bd ON bd.sid = bo.purchaseApplyMediumModelSid
+                             LEFT JOIN anrui_base.base_vehicle_model bbm ON bbm.sid = bd.vehicleSid
+                             LEFT JOIN (
+                             SELECT bbbbo.linkSid,
+                                    ifnull(count(bbbbo.linkSid), 0) as counts
+                             FROM anrui_buscenter.bus_sales_vehicle_order bbbbo
+                                      LEFT JOIN anrui_buscenter.bus_sales_order bb ON bb.sid = bbbbo.salesOrderSid
+                             WHERE LENGTH(bb.nodeState) > 0
+                               AND bb.nodeState != '终止' and bb.nodeState != '销售订单申请'
+                             group by bbbbo.linkSid
+                         ) ab ON ab.linkSid = bo.sid
+                     WHERE
+                             bo.isDelete <> 1
+                       AND LENGTH( offlineDate ) = 0
+                       AND bo.orderStatus != '已作废' group by bo.createOrgSid,bd.vehicleSid,bd.configSid
                  ) as v
             GROUP BY v.`useOrgSid`,
                      v.`modelSid`,