修改履约进度表的挂单车数计算逻辑

performance-web/src/main/java/com/clx/performance/service/impl/PerformanceProgressServiceImpl.java

@@ -438,7 +438,7 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
             throw new ServiceSystemException(ResultEnum.DATA_NOT_FIND);
         }
         //根据挂单时间倒序排序
-        List<OrderGoods> orderGoods = orderGoodsDao.listAllByOrderNo(data.getOrderNo());
+        List<OrderGoods> orderGoods = orderGoodsDao.list(data.getOrderNo());
         if(CollectionUtils.isEmpty(orderGoods)){
             return;
         }
@@ -477,16 +477,19 @@ public class PerformanceProgressServiceImpl  implements PerformanceProgressServi
     //统计挂单车数
     public Integer calcPendingTruck(List<OrderGoods> orderGoods){
         int totalNeedTruck = 0;
-        List<String> cancelOrderGoodsNo = new ArrayList<>();
+        List<String> completedOrderGoodsNo = new ArrayList<>();
         for (OrderGoods item : orderGoods) {
-            if(Objects.equals(item.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.CANCEL.getCode())){
-                cancelOrderGoodsNo.add(item.getOrderGoodsNo());
+            if(!Objects.equals(item.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.CANCEL.getCode())){
+                if(Objects.equals(item.getOrderGoodsStatus(),OrderGoodsStatusEnum.Status.COMPLETED.getCode())){
+                    completedOrderGoodsNo.add(item.getOrderGoodsNo());
                 }else{
                     totalNeedTruck = totalNeedTruck + item.getNeedTruckNum();
                 }
+
+            }
         }
-        if(CollectionUtils.isNotEmpty(cancelOrderGoodsNo)){
-            Long count = orderChildDao.countNotCancelOrderChild(cancelOrderGoodsNo);
+        if(CollectionUtils.isNotEmpty(completedOrderGoodsNo)){
+            Long count = orderChildDao.countNotCancelOrderChild(completedOrderGoodsNo);
             totalNeedTruck = totalNeedTruck + count.intValue();
         }