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
0139d80b
Commit
0139d80b
authored
Sep 10, 2019
by
jiaorz
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改提前还车逻辑
parent
fdd9c4f8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
VehicleActiveService.java
...a/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
+1
-1
No files found.
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
View file @
0139d80b
...
@@ -325,7 +325,7 @@ public class VehicleActiveService {
...
@@ -325,7 +325,7 @@ public class VehicleActiveService {
while
(
iterator
.
hasNext
())
{
while
(
iterator
.
hasNext
())
{
VehicleBookRecordVo
vehicleBookRecordVo
=
iterator
.
next
();
VehicleBookRecordVo
vehicleBookRecordVo
=
iterator
.
next
();
//未出车且超过出车时间和已出车的和本条记录过滤,剩下为正常未出车记录
//未出车且超过出车时间和已出车的和本条记录过滤,剩下为正常未出车记录
if
((
arrivalVo
.
getBookRecordId
()
=
=
vehicleBookRecordVo
.
getId
())
||
(
vehicleBookRecordVo
.
getVehicleDepartureLogVo
()
==
null
&&
vehicleBookRecordVo
.
getBookEndDate
().
getTime
()
-
new
Date
().
getTime
()
<
0
)
||
(
vehicleBookRecordVo
.
getVehicleDepartureLogVo
()
!=
null
))
{
if
((
arrivalVo
.
getBookRecordId
()
<
=
vehicleBookRecordVo
.
getId
())
||
(
vehicleBookRecordVo
.
getVehicleDepartureLogVo
()
==
null
&&
vehicleBookRecordVo
.
getBookEndDate
().
getTime
()
-
new
Date
().
getTime
()
<
0
)
||
(
vehicleBookRecordVo
.
getVehicleDepartureLogVo
()
!=
null
))
{
iterator
.
remove
();
iterator
.
remove
();
}
}
}
}
...
...
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