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
2962da62
Commit
2962da62
authored
Aug 27, 2019
by
周健威
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复跨月查询bug
parent
19a040ac
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
+4
-4
VehicleMapper.xml
...ehicle-server/src/main/resources/mapper/VehicleMapper.xml
+4
-4
No files found.
xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
View file @
2962da62
...
@@ -523,7 +523,7 @@
...
@@ -523,7 +523,7 @@
<!-- yearNo4Where 标识时间参数不用于where条件,用于select部分 -->
<!-- yearNo4Where 标识时间参数不用于where条件,用于select部分 -->
<if
test=
" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true"
>
<if
test=
" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true"
>
,(max(
,(max(
vbi.bit_str = #{yearMonthAndParam}
vbi.bit_str = #{yearMonthAndParam
BitStr
}
<!-- 租车列表 不过滤前后预约记录不符的车辆 但是合并标示车型是否有车 即 hasVehicle-->
<!-- 租车列表 不过滤前后预约记录不符的车辆 但是合并标示车型是否有车 即 hasVehicle-->
<if
test=
"withoutRecordWhere != null and withoutRecordWhere = 1 and startCompanyId != null and endCompanyId != null "
>
<if
test=
"withoutRecordWhere != null and withoutRecordWhere = 1 and startCompanyId != null and endCompanyId != null "
>
and (abr.to_lift_company is null or abr.to_lift_company = #{startCompanyId})
and (abr.to_lift_company is null or abr.to_lift_company = #{startCompanyId})
...
@@ -618,7 +618,7 @@
...
@@ -618,7 +618,7 @@
<if
test=
" yearMonthAndParam !=null "
>
<if
test=
" yearMonthAndParam !=null "
>
left join (
left join (
select
select
v
ehicle_book_info
.vehicle,
v
bi
.vehicle,
BIT_OR(
BIT_OR(
CONCAT(
CONCAT(
<foreach
collection=
"yearMonthAndParam"
index=
"yearMonth"
item=
"andOperation"
separator=
","
>
<foreach
collection=
"yearMonthAndParam"
index=
"yearMonth"
item=
"andOperation"
separator=
","
>
...
@@ -626,7 +626,7 @@
...
@@ -626,7 +626,7 @@
</foreach>
</foreach>
)
)
) as bit_str
) as bit_str
from vehicle_book_info
group by vehicle_book_info
.vehicle
from vehicle_book_info
vbi group by vbi
.vehicle
) vbi on v.`id` = vbi.vehicle
) vbi on v.`id` = vbi.vehicle
</if>
</if>
left join vehicle_model vm on v.model_id = vm.id
left join vehicle_model vm on v.model_id = vm.id
...
@@ -643,7 +643,7 @@
...
@@ -643,7 +643,7 @@
<!-- 若需根据预定日期条件查询,针对换为位操作 -->
<!-- 若需根据预定日期条件查询,针对换为位操作 -->
<!-- yearNo4Where 标识时间参数是否用于where条件 -->
<!-- yearNo4Where 标识时间参数是否用于where条件 -->
<if
test=
" yearMonthAndParam !=null and yearMonthAndParam != null and yearNo4Where == null"
>
<if
test=
" yearMonthAndParam !=null and yearMonthAndParam != null and yearNo4Where == null"
>
vbi.bit_str = #{yearMonthAndParam}
vbi.bit_str = #{yearMonthAndParam
BitStr
}
</if>
</if>
<!-- 根据前后record 过滤车辆 -->
<!-- 根据前后record 过滤车辆 -->
...
...
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