提交轨迹修改

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

@@ -119,7 +119,7 @@ public class KwtLogisticsOrderRepository extends ServiceImpl<KwtLogisticsOrderMa
     public KwtLogisticsOrder queryByLogisticOrderId(String lOrderNo) {
         return getOne(Wrappers.<KwtLogisticsOrder>lambdaQuery()
                 .eq(KwtLogisticsOrder::getDelFlag,0)
-                .eq(KwtLogisticsOrder::getId, lOrderNo)
+                .eq(KwtLogisticsOrder::getLOrderNo, lOrderNo)
                 .last("limit 1"));
     }
 

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

@@ -1050,6 +1050,7 @@ public class kwfTruckTraceService {
         List<KwtLogisticsOrderUnit> logisticsOrderUnits = Lists.newArrayList();
         List<KwtLogisticsOrderGoods> goodsList = Lists.newArrayList();
         List<KwtLogisticsOrderAddress> logisticsOrderAddress = Lists.newArrayList();
+        Map<Long, KwtLogisticsOrder> logisticsOrderMap = Maps.newHashMap();
         if (CollectionUtils.isNotEmpty(lOrderIds)) {
             // 查询托运企业和承运企业
             logisticsOrderUnits = kwtLogisticsOrderUnitRepository.queryByLOrderIds(new ArrayList<>(lOrderIds));
@@ -1057,6 +1058,10 @@ public class kwfTruckTraceService {
             goodsList = kwtLogisticsOrderGoodsRepository.queryByLOrderIds(new ArrayList<>(lOrderIds));
             //查询物流地址
             logisticsOrderAddress = kwtLogisticsOrderAddressRepository.queryByLogOrderIds(new ArrayList<>(lOrderIds));
+            List<KwtLogisticsOrder> kwtLogisticsOrders = kwtLogisticsOrderRepository.queryByLogisticsOrderIds(new ArrayList<>(lOrderIds));
+            logisticsOrderMap = Optional.ofNullable(kwtLogisticsOrders)
+                    .orElse(List.of()).stream()
+                    .collect(Collectors.toMap(KwtLogisticsOrder::getId, Function.identity(), (k1, k2) -> k1));
         }
         Map<String, KwtLogisticsOrderAddress> logisticsOrderAddressMap = Maps.newHashMap();
         if (CollectionUtils.isNotEmpty(logisticsOrderAddress)){
@@ -1125,9 +1130,10 @@ public class kwfTruckTraceService {
         Map<Long, RTruckVo> finalTruckIdMap = truckIdMap;
         Map<String, SysDictResDto> finalEnergyTypeMap = energyTypeMap;
         Map<String, KwtLogisticsOrderAddress> finalLogisticsOrderAddressMap = logisticsOrderAddressMap;
+        Map<Long, KwtLogisticsOrder> finalLogisticsOrderMap = logisticsOrderMap;
         List<MapVehicleVo> result = filteredOrders.stream()
                 .map(order -> buildMapVehicleVo(order, wOrderIdSubtaskMap, finalUnitMap, finalGoodsMap,
-                        locationInfoMap, exceptionCountMap, finalTruckIdMap, finalEnergyTypeMap, finalLogisticsOrderAddressMap))
+                        locationInfoMap, exceptionCountMap, finalTruckIdMap, finalEnergyTypeMap, finalLogisticsOrderAddressMap, finalLogisticsOrderMap))
                 .collect(Collectors.toList());
         
         // 根据排序类型进行排序
@@ -1374,7 +1380,8 @@ public class kwfTruckTraceService {
                                            Map<String, Integer> exceptionCountMap,
                                            Map<Long, RTruckVo> truckIdMap,
                                            Map<String, SysDictResDto> energyTypeMap,
-                                           Map<String, KwtLogisticsOrderAddress> logisticsOrderAddressMap) {
+                                           Map<String, KwtLogisticsOrderAddress> logisticsOrderAddressMap,
+                                           Map<Long, KwtLogisticsOrder> logisticsOrderMap) {
         MapVehicleVo vo = new MapVehicleVo();
         
         // 车辆和司机信息
@@ -1392,7 +1399,8 @@ public class kwfTruckTraceService {
         KwtWaybillOrderSubtask subtask = subtaskMap.get(order.getId());
         if (subtask != null) {
             vo.setLogisticOrderId(subtask.getLOrderId());
-            vo.setLogisticOrderNo(String.valueOf(subtask.getLOrderId()));
+            KwtLogisticsOrder logisticsOrder = logisticsOrderMap.getOrDefault(subtask.getLOrderId(), new KwtLogisticsOrder());
+            vo.setLogisticOrderNo(logisticsOrder.getLOrderNo());
             vo.setLoadAmount(subtask.getLoadAmount());
             vo.setEntrustAmount(subtask.getEntrustAmount());
             vo.setUnit(subtask.getUnit());