From 043ce69a475e30ddb9826ac1fb67efa42947e40f Mon Sep 17 00:00:00 2001
From: zhenghaoyu <zhenghaoyu@superbgrace.com>
Date: Tue, 31 Dec 2024 08:13:37 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=97=B6=E6=95=88=E6=8A=A5=E8=A1=A8bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logpm/report/mapper/ReportTimeMapper.xml  | 48 +++++++++----------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml
index 10c11c201..d4538df4e 100644
--- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml
+++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/ReportTimeMapper.xml
@@ -854,18 +854,6 @@
         <if test="param.endTime != null ">
             and ltad.create_time &lt;= #{param.endTime}
         </if>
-        and ldpl.warehouse_id = ldpl.accept_warehouse_id
-        and ldpl.warehouse_id != ldpl.send_warehouse_id
-        group by ldpl.waybill_id) t
-        left join logpm_warehouse_waybill lww on lww.id = t.waybill_id
-        left join logpm_warehouse_warehouse waw on waw.id = lww.departure_warehouse_id
-        where 1=1
-        <if test="param.businessLineList != null and param.businessLineList.size() > 0">
-            and waw.business_line in
-            <foreach collection="param.businessLineList" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
         <if test="param.brandList != null and param.brandList.size() > 0">
             and ltad.brand in
             <foreach collection="param.brandList" item="item" open="(" separator="," close=")">
@@ -884,6 +872,18 @@
                 #{item}
             </foreach>
         </if>
+        and ldpl.warehouse_id = ldpl.accept_warehouse_id
+        and ldpl.warehouse_id != ldpl.send_warehouse_id
+        group by ldpl.waybill_id) t
+        left join logpm_warehouse_waybill lww on lww.id = t.waybill_id
+        left join logpm_warehouse_warehouse waw on waw.id = lww.departure_warehouse_id
+        where 1=1
+        <if test="param.businessLineList != null and param.businessLineList.size() > 0">
+            and waw.business_line in
+            <foreach collection="param.businessLineList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         group by waw.business_line,
         lww.departure_warehouse_name,
         lww.destination_warehouse_name,
@@ -947,18 +947,6 @@
         <if test="param.endTime != null ">
             and ltad.create_time &lt;= #{param.endTime}
         </if>
-        and ldpl.warehouse_id = ldpl.accept_warehouse_id
-        and ldpl.warehouse_id != ldpl.send_warehouse_id
-        group by ldpl.waybill_id) t
-        left join logpm_warehouse_waybill lww on lww.id = t.waybill_id
-        left join logpm_warehouse_warehouse waw on waw.id = lww.departure_warehouse_id
-        where 1=1
-        <if test="param.businessLineList != null and param.businessLineList.size() > 0">
-            and waw.business_line in
-            <foreach collection="param.businessLineList" item="item" open="(" separator="," close=")">
-                #{item}
-            </foreach>
-        </if>
         <if test="param.brandList != null and param.brandList.size() > 0">
             and ltad.brand in
             <foreach collection="param.brandList" item="item" open="(" separator="," close=")">
@@ -977,6 +965,18 @@
                 #{item}
             </foreach>
         </if>
+        and ldpl.warehouse_id = ldpl.accept_warehouse_id
+        and ldpl.warehouse_id != ldpl.send_warehouse_id
+        group by ldpl.waybill_id) t
+        left join logpm_warehouse_waybill lww on lww.id = t.waybill_id
+        left join logpm_warehouse_warehouse waw on waw.id = lww.departure_warehouse_id
+        where 1=1
+        <if test="param.businessLineList != null and param.businessLineList.size() > 0">
+            and waw.business_line in
+            <foreach collection="param.businessLineList" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         group by waw.business_line,
         lww.departure_warehouse_name,
         lww.destination_warehouse_name,