|
@@ -1962,8 +1962,9 @@ public class KwfTruckService {
|
|
|
Map<String, KwfTruck> truckMap = new HashMap<>();
|
|
Map<String, KwfTruck> truckMap = new HashMap<>();
|
|
|
if (!truckNoList.isEmpty()) {
|
|
if (!truckNoList.isEmpty()) {
|
|
|
List<KwfTruck> kwfTruckList = findTruckByEntIds(entId);
|
|
List<KwfTruck> kwfTruckList = findTruckByEntIds(entId);
|
|
|
|
|
+ //过滤掉已经停用的车牌号
|
|
|
List<KwfTruck> trucks = kwfTruckList.stream().filter(Objects::nonNull)
|
|
List<KwfTruck> trucks = kwfTruckList.stream().filter(Objects::nonNull)
|
|
|
- .filter(truck -> truck.getTruckNo() != null && truckNoList.contains(truck.getTruckNo()))
|
|
|
|
|
|
|
+ .filter(truck -> truck.getTruckNo() != null && truckNoList.contains(truck.getTruckNo()) && Objects.equals(truck.getStatus(), 0))
|
|
|
.collect(Collectors.toList());
|
|
.collect(Collectors.toList());
|
|
|
truckMap = trucks.stream()
|
|
truckMap = trucks.stream()
|
|
|
.collect(Collectors.toMap(KwfTruck::getTruckNo, Function.identity(), (k1, k2) -> k1));
|
|
.collect(Collectors.toMap(KwfTruck::getTruckNo, Function.identity(), (k1, k2) -> k1));
|