Merge branch 'pre-production'

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<String, String> 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<String, String> 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<String, String> 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<String, String> firstEntry : firstRouteMap.entrySet()) {

blade-service/logpm-trunkline/src/main/java/com/logpm/trunkline/mapper/TrunklineCarsLoadScanMapper.xml

@@ -1221,7 +1221,7 @@
 
         SELECT GROUP_CONCAT(DISTINCT lww.brand) brands from logpm_warehouse_waybill lww LEFT JOIN
         logpm_trunkline_cars_load_scan ltcls  on lww.id= ltcls.waybill_id
-        where ltcls.load_code=#{loadCode} GROUP BY lww.brand
+        where ltcls.load_code=#{loadCode}
 
     </select>