Selaa lähdekoodia

门卫订单查询逻辑优化

donglang 1 kuukausi sitten
vanhempi
commit
ed9aff6b71

+ 2 - 2
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/ForkliftOrderService.java

@@ -325,7 +325,7 @@ public class ForkliftOrderService {
             //组装铲车订单数据
             List<ForkliftOrderResp> forkliftOrders = records.stream()
                     .map(forkliftOrder -> buildForkliftOrderResp(forkliftOrder, waybillOrderMap,
-                            waybillOrderTicketMap, logisticsOrderMap, typeNullList, Boolean.FALSE)).toList();
+                            waybillOrderTicketMap, logisticsOrderMap, typeNullList, Boolean.FALSE)).collect(Collectors.toList());
             forkliftOrderRespList.addAll(forkliftOrders);
         }
 
@@ -333,7 +333,7 @@ public class ForkliftOrderService {
             //组装铲车订单数据
             List<ForkliftOrderResp> rawOreForkliftOrders = records.stream()
                     .map(forkliftOrder -> buildForkliftOrderResp(forkliftOrder, waybillOrderMap,
-                            waybillOrderTicketMap, logisticsOrderMap, typeOneList, Boolean.TRUE)).toList();
+                            waybillOrderTicketMap, logisticsOrderMap, typeOneList, Boolean.TRUE)).collect(Collectors.toList());
             forkliftOrderRespList.addAll(rawOreForkliftOrders);
         }
 

+ 3 - 1
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/app/GatekeeperOrderService.java

@@ -326,7 +326,8 @@ public class GatekeeperOrderService {
             //组装铲车订单数据
             List<GatekeeperOrderResp> rawOreGatekeeperOrderResp = records.stream()
                     .map(gatekeeperWaybillOrder -> buildGatekeeperOrderResp(gatekeeperWaybillOrder,
-                            waybillOrderMap, waybillOrderTicketMap, logisticsOrderMap, logisticsOrder)).toList();
+                            waybillOrderMap, waybillOrderTicketMap, logisticsOrderMap, logisticsOrder))
+                            .collect(Collectors.toList());
         log.info("门卫订单查询结束,result:{}", JSON.toJSONString(rawOreGatekeeperOrderResp));
         return rawOreGatekeeperOrderResp;
 
@@ -428,6 +429,7 @@ public class GatekeeperOrderService {
      * @param gatekeeperOrderPageResult
      */
     private void sort(GatekeeperOrderQueryParam param, List<GatekeeperOrderResp> gatekeeperOrderPageResult) {
+        log.info("门卫订单拍寻,param:{}, order:{}", JSON.toJSONString(param), JSON.toJSONString(gatekeeperOrderPageResult));
         if (CollectionUtils.isEmpty(gatekeeperOrderPageResult)) {
             return;
         }