Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/WaybillManagementService.java

@@ -206,6 +206,10 @@ public class WaybillManagementService {
         statuses.forEach(e -> {
             WaybillStatusVO waybillStatusVO = new WaybillStatusVO();
             waybillStatusVO.setStatus(false);
+            if(e.equals(CarWaybillEnum.PENDING_ORDER.getCode())) {
+                // 默认选中 待接单 状态
+                waybillStatusVO.setStatus(true);
+            }
             waybillStatusVO.setCode(e);
             waybillStatusVO.setDestination(CarWaybillEnum.getName(e));
             statusVOS.add(waybillStatusVO);
@@ -394,6 +398,10 @@ public class WaybillManagementService {
         statuses.forEach(e -> {
             WaybillStatusVO waybillStatusVO = new WaybillStatusVO();
             waybillStatusVO.setStatus(false);
+            if(e.equals(CarWaybillEnum.PENDING_ORDER.getCode())) {
+                // 默认选中 待接单 状态
+                waybillStatusVO.setStatus(true);
+            }
             waybillStatusVO.setCode(e);
             waybillStatusVO.setDestination(CarWaybillEnum.getName(e));
             statusVOS.add(waybillStatusVO);
@@ -967,6 +975,7 @@ public class WaybillManagementService {
         );
         Map<String, String> amount = new HashMap<>();
         // 总计条数
+        amount.put("total", String.valueOf(wOrders.size()));
         BigDecimal loadAmount = new BigDecimal(Global.AMOUNT);
         BigDecimal unloadAmount = new BigDecimal(Global.AMOUNT);
         BigDecimal lossAmount = new BigDecimal(Global.AMOUNT);