diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/LargeScreenController.java b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/LargeScreenController.java index ee89b4b2e..46f3c33f8 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/controller/LargeScreenController.java +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/controller/LargeScreenController.java @@ -62,7 +62,7 @@ public class LargeScreenController{ this.trunkData = trunkData; this.deliveryDataService = deliveryDataService; this.businessRatio = businessRatio; - } + } /** diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/BillingDataMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/BillingDataMapper.xml index dff9e478a..61ada2f67 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/BillingDataMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/largeScreen/BillingDataMapper.xml @@ -18,7 +18,7 @@ count(d.id) as value, w.destination_warehouse_id as warehouseId from logpm_platform.logpm_warehouse_waybill as w - INNER JOIN logpm_platform.logpm_trunkline_advance_detail as d on w.waybill_no = d.waybill_no + INNER JOIN logpm_platform.logpm_trunkline_advance_detail as d on w.id = d.waybill_id where w.freeze_status = 0 and w.create_time BETWEEN #{startTime} and #{endTime} group by w.destination_warehouse_id @@ -30,7 +30,7 @@ count(d.id) as value, date_format(w.create_time, '%Y-%m') as month from logpm_platform.logpm_warehouse_waybill as w - INNER JOIN logpm_platform.logpm_trunkline_advance_detail as d on w.waybill_no = d.waybill_no + INNER JOIN logpm_platform.logpm_trunkline_advance_detail as d on w.id = d.waybill_id where w.freeze_status = 0 and w.create_time BETWEEN #{startTime} and #{endTime} group by month