Sfoglia il codice sorgente

提交解绑车辆bug

chenxiaofei 5 mesi fa
parent
commit
cdc198b07c

+ 2 - 1
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtLogisticsOrderContractRepository.java

@@ -34,7 +34,8 @@ public class KwtLogisticsOrderContractRepository extends ServiceImpl<KwtLogistic
     public List<KwtLogisticsOrderContract> queryByContractId(Long contractId ) {
         return list(Wrappers.<KwtLogisticsOrderContract>lambdaQuery()
                 .eq(KwtLogisticsOrderContract::getDelFlag,0)
-                .eq(KwtLogisticsOrderContract::getContractId,contractId));
+                .eq(KwtLogisticsOrderContract::getContractId,contractId)
+                .select(KwtLogisticsOrderContract::getId,KwtLogisticsOrderContract::getContractId,KwtLogisticsOrderContract::getLOrderId));
     }
 
     public List<KwtLogisticsOrderContract> queryByLogContractIds(Set<Long> logContractIds) {

+ 2 - 1
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/repository/KwtLogisticsOrderUnitRepository.java

@@ -40,7 +40,8 @@ public class KwtLogisticsOrderUnitRepository extends ServiceImpl<KwtLogisticsOrd
     public List<KwtLogisticsOrderUnit> queryByEntIds(Set<Long> entIds) {
         return list(Wrappers.<KwtLogisticsOrderUnit>lambdaQuery()
                 .eq(KwtLogisticsOrderUnit::getDelFlag,0)
-                .in(KwtLogisticsOrderUnit::getEntId,entIds));
+                .in(KwtLogisticsOrderUnit::getEntId,entIds)
+                .select(KwtLogisticsOrderUnit::getId,KwtLogisticsOrderUnit::getLOrderId,KwtLogisticsOrderUnit::getEntId));
     }
 
     public List<KwtLogisticsOrderUnit> queryByLOrderId(Long logOrderId) {

+ 2 - 1
sckw-modules/sckw-transport/src/main/java/com/sckw/transport/service/KwtTransportCommonService.java

@@ -1909,9 +1909,10 @@ public class KwtTransportCommonService {
             return List.of();
         }
         //
+
         return units.stream()
                 .collect(Collectors.toMap(
-                        unit -> unit.getEntId(),
+                        unit -> unit.getEntId() + "_" + unit.getUnitType(),
                         unit -> unit,
                         (existing, replacement) -> existing,
                         LinkedHashMap::new))