Merge remote-tracking branch 'origin/pre-production'

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,