Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
C
cloud-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
youjj
cloud-platform
Commits
cd8246a9
Commit
cd8246a9
authored
Aug 15, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改master 触发租车预约bug
parent
2e0c04db
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
RentVehicleBookDTO.java
...va/com/xxfc/platform/vehicle/pojo/RentVehicleBookDTO.java
+3
-0
VehicleController.java
...ava/com/xxfc/platform/vehicle/rest/VehicleController.java
+1
-0
No files found.
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/RentVehicleBookDTO.java
View file @
cd8246a9
...
@@ -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,数量>>
*/
*/
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java
View file @
cd8246a9
...
@@ -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
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment