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
d5c41661
Commit
d5c41661
authored
Sep 10, 2019
by
hezhen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://113.105.137.151:22280/youjj/cloud-platform
parents
73fc138e
94f9cf9b
Changes
2
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
171 additions
and
188 deletions
+171
-188
VehicleActiveService.java
...a/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
+170
-187
VehicleBookRecordMapper.xml
...ver/src/main/resources/mapper/VehicleBookRecordMapper.xml
+1
-1
No files found.
xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
View file @
d5c41661
This diff is collapsed.
Click to expand it.
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml
View file @
d5c41661
...
@@ -327,7 +327,7 @@
...
@@ -327,7 +327,7 @@
<select
id=
"selectByVehicleIdAndTime"
parameterType=
"java.util.Map"
resultMap=
"searchBookRecord"
>
<select
id=
"selectByVehicleIdAndTime"
parameterType=
"java.util.Map"
resultMap=
"searchBookRecord"
>
select v1.* from vehicle_book_record v1
select v1.* from vehicle_book_record v1
where v1.vehicle_id = #{vehicleId}
and v1.book_end_date
<
= #{bookedEndDate}
and v1.status BETWEEN 1 and 2
where v1.vehicle_id = #{vehicleId} and v1.status BETWEEN 1 and 2
</select>
</select>
<select
id=
"selectZeroHourRecord"
resultMap=
"searchBookRecord"
parameterType=
"java.util.Map"
>
<select
id=
"selectZeroHourRecord"
resultMap=
"searchBookRecord"
parameterType=
"java.util.Map"
>
...
...
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