Commit 87d731ec authored by 周健威's avatar 周健威

修改bug

parent 851636f8
...@@ -283,20 +283,20 @@ public class VehicleController extends BaseController<VehicleBiz> { ...@@ -283,20 +283,20 @@ public class VehicleController extends BaseController<VehicleBiz> {
public ObjectRestResponse<PageDataVO<UsableVehicleModelVO>> rentUsableVehicle(UsableVeicleDTO dto) throws Exception { public ObjectRestResponse<PageDataVO<UsableVehicleModelVO>> rentUsableVehicle(UsableVeicleDTO dto) throws Exception {
//根据时间 获得 可用车辆 //根据时间 获得 可用车辆
//结合车型 //结合车型
List<Integer> catasIds = Pattern.compile(",").splitAsStream(dto.getCatasStr()).map((s)-> Integer.parseInt(s)).collect(Collectors.toList()); if(StringUtils.isNotBlank(dto.getCatasStr())) {
List<VehiclePlatCata> catas = vehiclePlatCataBiz.selectByExample(new Example.Builder(VehiclePlatCata.class) List<Integer> catasIds = Pattern.compile(",").splitAsStream(dto.getCatasStr()).map((s)-> Integer.parseInt(s)).collect(Collectors.toList());
.where(WeekendSqls.<VehiclePlatCata>custom().andIn(VehiclePlatCata::getId, catasIds)).build()); List<VehiclePlatCata> catas = vehiclePlatCataBiz.selectByExample(new Example.Builder(VehiclePlatCata.class)
Map<Integer, List<VehiclePlatCata>> vpcMap = new HashMap<Integer, List<VehiclePlatCata>>(); .where(WeekendSqls.<VehiclePlatCata>custom().andIn(VehiclePlatCata::getId, catasIds)).build());
for(VehiclePlatCata vpc : catas) { Map<Integer, List<VehiclePlatCata>> vpcMap = new HashMap<Integer, List<VehiclePlatCata>>();
List<VehiclePlatCata> vpcs = vpcMap.get(vpc.getParentId()); for(VehiclePlatCata vpc : catas) {
if(null == vpcs) { List<VehiclePlatCata> vpcs = vpcMap.get(vpc.getParentId());
vpcs = new ArrayList<VehiclePlatCata>(); if(null == vpcs) {
vpcs = new ArrayList<VehiclePlatCata>();
}
vpcs.add(vpc);
vpcMap.put(vpc.getParentId(), vpcs);
} }
vpcs.add(vpc);
vpcMap.put(vpc.getParentId(), vpcs);
}
if(StringUtils.isNotBlank(dto.getCatasStr())) {
dto.setCatas(vpcMap); dto.setCatas(vpcMap);
} }
return new ObjectRestResponse<>().data(vehicleBiz.searchUsableModel(dto)).rel(true); return new ObjectRestResponse<>().data(vehicleBiz.searchUsableModel(dto)).rel(true);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment