Commit cd8246a9 authored by 周健威's avatar 周健威

修改master 触发租车预约bug

parent 2e0c04db
...@@ -57,6 +57,9 @@ public class RentVehicleBookDTO extends PageParam { ...@@ -57,6 +57,9 @@ public class RentVehicleBookDTO extends PageParam {
@ApiModelProperty("订单号") @ApiModelProperty("订单号")
private String orderNo; private String orderNo;
@ApiModelProperty("停靠公司id")
Integer parkBranchCompanyId;
/** /**
* 随车物品id以及数量 List<Map<id,数量>> * 随车物品id以及数量 List<Map<id,数量>>
*/ */
......
...@@ -428,6 +428,7 @@ public class VehicleController extends BaseController<VehicleBiz> { ...@@ -428,6 +428,7 @@ public class VehicleController extends BaseController<VehicleBiz> {
//BaseContextHandler.getName(); //BaseContextHandler.getName();
dto.setLimit(1); dto.setLimit(1);
dto.setPage(1); dto.setPage(1);
dto.setParkBranchCompanyId(dto.getLiftCompany());
//查询可车辆信息 //查询可车辆信息
PageDataVO<Vehicle> pageDataVO = vehicleBiz.searchUsableVehicle(dto); PageDataVO<Vehicle> pageDataVO = vehicleBiz.searchUsableVehicle(dto);
if (pageDataVO.getData().size() <= 0) { if (pageDataVO.getData().size() <= 0) {
......
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