From 5470f24f5083bf8192cd06468c027cc6c54ce562 Mon Sep 17 00:00:00 2001
From: lzq <2495532633@qq.com>
Date: Fri, 14 Nov 2025 14:10:05 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A6=96=E7=82=AC=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/SupervisionStatisticsMapper.xml    | 21 +++++++++++--------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/njzscloud-svr/src/main/resources/mapper/SupervisionStatisticsMapper.xml b/njzscloud-svr/src/main/resources/mapper/SupervisionStatisticsMapper.xml
index 9ea3750..81449a8 100644
--- a/njzscloud-svr/src/main/resources/mapper/SupervisionStatisticsMapper.xml
+++ b/njzscloud-svr/src/main/resources/mapper/SupervisionStatisticsMapper.xml
@@ -24,8 +24,9 @@
               WHERE a.status = 2
               UNION ALL
               SELECT COUNT(*) c, 3 t
-              FROM ba_order_dispatch
-              WHERE status = 3) t
+              FROM ba_order
+              WHERE type = 5
+                AND finish = 1) t
     </select>
 
     <select id="getYuYueSummary" resultType="com.njzscloud.supervisory.statistics.pojo.YuYueSummary">
@@ -38,14 +39,16 @@
               FROM (SELECT COUNT(*) c, 1 t
                     FROM ba_order a
                              INNER JOIN ba_order_dispatch b ON b.order_no = a.order_no
-                    WHERE UNIX_TIMESTAMP(a.create_time) >= UNIX_TIMESTAMP(CURDATE())
-                      AND UNIX_TIMESTAMP(a.create_time)  <![CDATA[ < ]]>  UNIX_TIMESTAMP(DATE_ADD(CURDATE(), INTERVAL -24 HOUR))
+                    WHERE UNIX_TIMESTAMP(from_unixtime(a.create_time)) >= UNIX_TIMESTAMP(DATE_SUB(CURDATE(), INTERVAL 24 HOUR))
+                      AND UNIX_TIMESTAMP(from_unixtime(a.create_time))  <![CDATA[ < ]]>  UNIX_TIMESTAMP(CURDATE())
+                      AND a.status NOT IN (4, 5)
                     UNION ALL
                     SELECT COUNT(*) c, 2 t
                     FROM ba_order a
                              INNER JOIN ba_order_dispatch b ON b.order_no = a.order_no
-                    WHERE UNIX_TIMESTAMP(a.create_time) >= UNIX_TIMESTAMP(CURDATE())
-                      AND UNIX_TIMESTAMP(a.create_time)  <![CDATA[ < ]]>  UNIX_TIMESTAMP(DATE_ADD(CURDATE(), INTERVAL 24 HOUR))) t) tt
+                    WHERE UNIX_TIMESTAMP(from_unixtime(a.create_time)) >= UNIX_TIMESTAMP(CURDATE())
+                      AND a.status NOT IN (4, 5)
+                      AND UNIX_TIMESTAMP(from_unixtime(a.create_time))  <![CDATA[ < ]]>  UNIX_TIMESTAMP(DATE_ADD(CURDATE(), INTERVAL 24 HOUR))) t) tt
     </select>
 
     <select id="getDisposeTotalWeight" resultType="java.lang.Integer">
@@ -70,9 +73,9 @@
         SELECT COUNT(*) car_count
         FROM ba_order a
                  INNER JOIN ba_order_dispatch b ON b.order_no = a.order_no
-        WHERE UNIX_TIMESTAMP(a.create_time) >= UNIX_TIMESTAMP(CURDATE())
-          AND UNIX_TIMESTAMP(a.create_time) <![CDATA[ < ]]> UNIX_TIMESTAMP(DATE_ADD(CURDATE(), INTERVAL 24 HOUR))
-          AND a.status = 1
+        WHERE UNIX_TIMESTAMP(from_unixtime(a.create_time)) >= UNIX_TIMESTAMP(CURDATE())
+          AND UNIX_TIMESTAMP(from_unixtime(a.create_time)) <![CDATA[ < ]]> UNIX_TIMESTAMP(DATE_ADD(CURDATE(), INTERVAL 24 HOUR))
+          AND a.status NOT IN (4, 5)
     </select>
 
     <select id="getRegionSummary" resultType="com.njzscloud.supervisory.statistics.pojo.RegionSummary">