提交新增合同文件校验

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

@@ -2753,8 +2753,9 @@ public class KwtLogisticsConsignmentService {
         RTruckVo truckVo = finalTruckIdAndTruckMap.getOrDefault(t.getTruckId(), new RTruckVo());
         capacityVo.setCarAxis(truckVo.getCarAxis());
         List<KwtWaybillOrder> waybillOrders = finalBillOrderIdAndWaybillOrderMap.get(t.getTruckId());
-        capacityVo.setFinishWaybillCount(String.valueOf(waybillOrders.size()));
+        capacityVo.setFinishWaybillCount("0");
         if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(waybillOrders)){
+            capacityVo.setFinishWaybillCount(String.valueOf(waybillOrders.size()));
             BigDecimal loadAmount = waybillOrders.stream()
                     .filter(x -> Objects.nonNull(x.getLoadAmount()))
                     .map(KwtWaybillOrder::getLoadAmount)
@@ -2834,7 +2835,7 @@ public class KwtLogisticsConsignmentService {
             List<Long> truckIdList = logisticsOrderCirculates.stream()
                     .map(KwtLogisticsOrderCirculate::getTruckId)
                     .collect(Collectors.toList());
-            List<KwtLogisticsOrderCirculate> saveOrderCirculates = carInfos.stream().filter(t -> !truckIdList.contains(t.getTruckId()))
+            List<KwtLogisticsOrderCirculate> saveOrderCirculates = carInfos.stream().filter(t -> truckIdList.contains(t.getTruckId()))
                     .map(t -> getKwtLogisticsOrderCirculate(req, t, logOrderId, logisticsOrder))
                     .collect(Collectors.toList());
             insertOrderCirculates.addAll(saveOrderCirculates);
@@ -2980,7 +2981,7 @@ public class KwtLogisticsConsignmentService {
                 .sorted(Comparator.comparingInt(LogisticsOrderV1Enum::getCode))
                 .collect(Collectors.toList());
         OrderStatusStatisticsResp orderStatusStatisticsResp = new OrderStatusStatisticsResp();
-        orderStatusStatisticsResp.setTotalNum(String.valueOf(logisticsOrders.size()));
+        orderStatusStatisticsResp.setTotalNum("0");
         if (Objects.isNull(logisticsOrders)){
             Map<Integer, List<KwtLogisticsOrder>> statusAndLogOrdersMap = Maps.newHashMap() ;
             List<OrderStatusStatisticsResp.OrderStatusStatistics> statistics = orderV1Enums.stream()

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

@@ -3435,7 +3435,7 @@ public class KwtWaybillOrderV1Service {
                 .collect(Collectors.toList());
 
         StatisticsWaybillResp statisticsWaybillResp = new StatisticsWaybillResp();
-        statisticsWaybillResp.setTotalNum(String.valueOf(orders.size()));
+        statisticsWaybillResp.setTotalNum("0");
 
         if (CollectionUtils.isEmpty(orders)) {
             Map<Integer, List<KwtWaybillOrder>> stausAndBillOrdersMap = Maps.newHashMap();