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 @@ and ltad.create_time <= #{param.endTime} - 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 - - and waw.business_line in - - #{item} - - and ltad.brand in @@ -884,6 +872,18 @@ #{item} + 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 + + and waw.business_line in + + #{item} + + group by waw.business_line, lww.departure_warehouse_name, lww.destination_warehouse_name, @@ -947,18 +947,6 @@ and ltad.create_time <= #{param.endTime} - 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 - - and waw.business_line in - - #{item} - - and ltad.brand in @@ -977,6 +965,18 @@ #{item} + 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 + + and waw.business_line in + + #{item} + + group by waw.business_line, lww.departure_warehouse_name, lww.destination_warehouse_name,