diff --git a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java index 743fdf2b0..5bff37c1f 100644 --- a/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java +++ b/blade-service/logpm-distribution/src/main/java/com/logpm/distribution/receiver/report/DeliverFinishReportListener.java @@ -395,7 +395,7 @@ public class DeliverFinishReportListener implements ReportService { } // 最大公里数计算 if (NumberUtil.equals(kilometerCalculationRule, 3)) { - BigDecimal total = null; + BigDecimal total = BigDecimal.ZERO; String lastCode = null; if (CollUtil.isNotEmpty(firstRouteMap)) { for (Map.Entry firstEntry : firstRouteMap.entrySet()) { @@ -521,7 +521,7 @@ public class DeliverFinishReportListener implements ReportService { } // 最大公里数计算 if (NumberUtil.equals(subsidyKilometerRule, 3)) { - BigDecimal total = null; + BigDecimal total = BigDecimal.ZERO; String lastCode = null; if (CollUtil.isNotEmpty(firstRouteMap)) { for (Map.Entry firstEntry : firstRouteMap.entrySet()) { @@ -673,7 +673,7 @@ public class DeliverFinishReportListener implements ReportService { if (NumberUtil.equals(overZoneKilometerRule, 3)) { Integer overZoneSiteMode = rule.getOverZoneSiteMode(); if (NumberUtil.equals(overZoneSiteMode, 1)) { - BigDecimal total = null; + BigDecimal total = BigDecimal.ZERO; String lastCode = null; if (CollUtil.isNotEmpty(firstRouteMap)) { for (Map.Entry firstEntry : firstRouteMap.entrySet()) { @@ -709,7 +709,7 @@ public class DeliverFinishReportListener implements ReportService { // 按区域计费 if (NumberUtil.equals(overZoneSiteMode, 2)) { if (CollUtil.isNotEmpty(overZoneEntityMap)) { - BigDecimal total = null; + BigDecimal total = BigDecimal.ZERO; String lastCode = null; if (CollUtil.isNotEmpty(firstRouteMap)) { for (Map.Entry firstEntry : firstRouteMap.entrySet()) { @@ -964,13 +964,13 @@ public class DeliverFinishReportListener implements ReportService { if (StrUtil.isNotEmpty(arrivePositioning)) { // A-B A-C A-D 仓库为起点到每一个点的距离 Long first = GaoDeApiUtil.measureDistance(firstPositioning, arrivePositioning); - firstRouteMap.put(value1.getSignReservationCode(), Convert.toStr(first / 1000)); + firstRouteMap.put(value1.getSignReservationCode(), Convert.toStr(ObjectUtil.isNotEmpty(first) ? NumberUtil.div(new BigDecimal(first), 1000) : 0L / 1000)); if (StrUtil.isEmpty(beforePositioning)) { beforePositioning = firstPositioning; } // A-B B-C C-D 每一个点为起点到下一个点的距离 Long distance = GaoDeApiUtil.measureDistance(beforePositioning, arrivePositioning); - allRouteMap.put(value1.getSignReservationCode(), Convert.toStr(distance / 1000)); + allRouteMap.put(value1.getSignReservationCode(), Convert.toStr(ObjectUtil.isNotEmpty(distance) ? NumberUtil.div(new BigDecimal(distance), 1000) : 0L / 1000)); beforePositioning = arrivePositioning; } } diff --git a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml index 8c318408a..9b24cdb7b 100644 --- a/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml +++ b/blade-service/logpm-report/src/main/java/com/logpm/report/mapper/QualityDispatchNumberMapper.xml @@ -248,6 +248,9 @@ 2 + + 0 + group by dl.warehouse_name @@ -294,6 +297,9 @@ 2 + + 0 + group by t.abnormal_type, dr.reservation_code) t diff --git a/blade-service/logpm-report/src/main/resources/application-dev.yml b/blade-service/logpm-report/src/main/resources/application-dev.yml index a03d28249..e75326109 100644 --- a/blade-service/logpm-report/src/main/resources/application-dev.yml +++ b/blade-service/logpm-report/src/main/resources/application-dev.yml @@ -21,6 +21,7 @@ spring: #启用sql日志拦截器 proxy-filters: - sqlLogInterceptor + query-timeout: 60000 #设置默认的数据源或者数据源组,默认值即为master primary: master datasource: diff --git a/blade-service/logpm-report/src/main/resources/application-prod.yml b/blade-service/logpm-report/src/main/resources/application-prod.yml index a03d28249..e75326109 100644 --- a/blade-service/logpm-report/src/main/resources/application-prod.yml +++ b/blade-service/logpm-report/src/main/resources/application-prod.yml @@ -21,6 +21,7 @@ spring: #启用sql日志拦截器 proxy-filters: - sqlLogInterceptor + query-timeout: 60000 #设置默认的数据源或者数据源组,默认值即为master primary: master datasource: diff --git a/blade-service/logpm-report/src/main/resources/application-test.yml b/blade-service/logpm-report/src/main/resources/application-test.yml index a03d28249..e75326109 100644 --- a/blade-service/logpm-report/src/main/resources/application-test.yml +++ b/blade-service/logpm-report/src/main/resources/application-test.yml @@ -21,6 +21,7 @@ spring: #启用sql日志拦截器 proxy-filters: - sqlLogInterceptor + query-timeout: 60000 #设置默认的数据源或者数据源组,默认值即为master primary: master datasource: diff --git a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailMapper.xml b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailMapper.xml index 68e9e287e..b4196e805 100644 --- a/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailMapper.xml +++ b/blade-service/logpm-statisticsdata/src/main/java/com/logpm/statistics/mapper/ExpenseDispatchTrainDetailMapper.xml @@ -43,6 +43,7 @@ and delivery_vehicle like concat('%', #{expenseDispatchTrainDetail.deliveryVehicle}, '%') + order by id desc