Commit 2962da62 authored by 周健威's avatar 周健威

修复跨月查询bug

parent 19a040ac
...@@ -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 = #{yearMonthAndParamBitStr}
<!-- 租车列表 不过滤前后预约记录不符的车辆 但是合并标示车型是否有车 即 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
vehicle_book_info.vehicle, vbi.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 = #{yearMonthAndParamBitStr}
</if> </if>
<!-- 根据前后record 过滤车辆 --> <!-- 根据前后record 过滤车辆 -->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment