铲车司机代码

sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtWaybillOrderRepository.java

@@ -340,4 +340,11 @@ public class KwtWaybillOrderRepository extends ServiceImpl<KwtWaybillOrderMapper
                 .orderByDesc(KwtWaybillOrder::getCreateTime);
         return page(page,wrapper);
     }
+
+    public List<KwtWaybillOrder> findOneById(List<Long> wOrderId) {
+        return list(Wrappers.<KwtWaybillOrder>lambdaQuery()
+                .in(KwtWaybillOrder::getId,wOrderId)
+                .eq(KwtWaybillOrder::getDelFlag,0)
+                .orderByDesc(KwtWaybillOrder::getId));
+    }
 }

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

@@ -29,6 +29,8 @@ import org.springframework.stereotype.Service;
 
 import java.util.*;
 import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.stream.Collectors;
 
 /**
  * Author: donglang
@@ -107,11 +109,23 @@ public class ForkliftOrderService {
         Page<KwtForkliftWaybillOrder> pageByStatus = forkliftWaybillOrderRepository.page(new Page<>(param.getPageNum(), param.getPageSize()), wrapper);
         List<KwtForkliftWaybillOrder> records = pageByStatus.getRecords();
         if (CollectionUtils.isEmpty(records)) {
-            log.info("当前铲车司机无物流运单，铲车司机id:{}", param.getDriverId());
+            log.info("当前铲车司机无铲车订单，铲车司机id:{}", param.getDriverId());
             return PageDataResult.empty(param.getPageNum(), param.getPageSize());
         }
+        //查询运单
+        List<Long> wOrderId = records.stream().map(KwtForkliftWaybillOrder::getWOrderId).filter(Objects::nonNull).collect(Collectors.toList());
+        List<KwtWaybillOrder> waybillOrders = waybillOrderRepository.findOneById(wOrderId);
+        if (CollectionUtils.isEmpty(waybillOrders)) {
+            log.info("当前铲车司机无物流运单，运单id:{}", JSON.toJSONString(param));
+            return PageDataResult.empty(param.getPageNum(), param.getPageSize());
+        }
+        Map<Long, KwtWaybillOrder> waybillOrderMap = waybillOrders.stream().collect(Collectors.toMap(KwtWaybillOrder::getId, Function.identity(), (x, y) -> x));
+
         List<ForkliftOrderResp> forkliftOrderList = new ArrayList<>();
         for (KwtForkliftWaybillOrder record : records) {
+
+
+
             ForkliftOrderResp forklift = new ForkliftOrderResp();
             forklift.setDriverId(record.getDriverId());
             forklift.setDriverName(record.getDriverName());