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
1b0dc853
Commit
1b0dc853
authored
Sep 11, 2020
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改查询车辆bug
parent
6723a534
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
+7
-0
RentVehicleBookDTO.java
...va/com/xxfc/platform/vehicle/pojo/RentVehicleBookDTO.java
+6
-0
RentVehicleController.java
...com/xxfc/platform/vehicle/rest/RentVehicleController.java
+1
-0
No files found.
xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/RentVehicleBookDTO.java
View file @
1b0dc853
...
...
@@ -116,6 +116,12 @@ public class RentVehicleBookDTO extends PageParam {
@ApiModelProperty
(
hidden
=
true
)
Integer
useType
=
1
;
/**
* 是否不检查时间字节上的冲突
*/
@ApiModelProperty
(
hidden
=
true
)
Boolean
yearNo4Where
;
/**
* 是否根据预订记录(相交叉)查询
* 原(大于预约结束时间,小于预约开始时间的预约记录)
...
...
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java
View file @
1b0dc853
...
...
@@ -162,6 +162,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
rbd
.
setRecordIntersection
(
Boolean
.
TRUE
);
rbd
.
setBookStartDateTime
(
dto
.
getStartDateTime
());
rbd
.
setBookEndDateTime
(
dto
.
getEndDateTime
());
rbd
.
setYearNo4Where
(
Boolean
.
TRUE
);
//查询可车辆信息
PageDataVO
<
UsableVeicleVO
>
pageDataVO
=
vehicleBiz
.
searchUsableVehicle
(
rbd
);
if
(
CollUtil
.
isNotEmpty
(
pageDataVO
.
getData
()))
{
...
...
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