Merge branch 'master-bug-rent' into dev

# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java

@@ -1028,6 +1028,11 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         }
         if(MapUtils.isNotEmpty(yearMonthAndParam)){
             params.put("yearMonthAndParam",yearMonthAndParam);
+            String bitStr = "";
+            for(String key : yearMonthAndParam.keySet()) {
+                bitStr+= "1";
+            }
+            params.put("yearMonthAndParamBitStr", bitStr);
         }
     }
 

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

@@ -344,7 +344,7 @@
     </select>
     <select id="selectByNumberPlate" resultType="com.xxfc.platform.vehicle.entity.Vehicle">
         select * from vehicle
-        where number_plate = #{numberPlate} and  is_del=0
+        where number_plate = #{numberPlate} and is_del=0
     </select>
 
     <select id="selectById" resultMap="searchModel">
@@ -523,16 +523,14 @@
         <!-- yearNo4Where 标识时间参数不用于where条件，用于select部分 -->
         <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
             ,(max(
-                <foreach collection="yearMonthAndParam" index="yearMonth" item="andOperation" separator="and">
-                    <include refid="yearMonthAndParamSql"></include>
-                </foreach>
+                vbi.bit_str = #{yearMonthAndParamBitStr}
                 <!-- 租车列表 不过滤前后预约记录不符的车辆 但是合并标示车型是否有车 即 hasVehicle-->
                 <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_return_company is null or abr.to_return_company = #{endCompanyId})
                 </if>
                 )
-            )as hasVehicle
+            ) as hasVehicle
         </if>
         <if test="lon != null and lat != null">
             ,st_distance_sphere(point(#{lon}, #{lat}), point(bc.longitude, bc.latitude)) as distance
@@ -618,8 +616,18 @@
     <sql id="searchUsableSql">
         from vehicle v
         <if test=" yearMonthAndParam !=null ">
-            left join
-            vehicle_book_info vbi on v.`id` = vbi.vehicle
+            left join (
+                select
+                    vbi.vehicle,
+                    BIT_OR(
+                       CONCAT(
+                           <foreach collection="yearMonthAndParam" index="yearMonth" item="andOperation" separator=",">
+                                <include refid="yearMonthAndParamSql"></include>
+                           </foreach>
+                       )
+                    ) as bit_str
+                from vehicle_book_info vbi group by vbi.vehicle
+            ) vbi on v.`id` = vbi.vehicle
         </if>
         left join vehicle_model vm on v.model_id = vm.id
         left join branch_company bc on v.park_branch_company_id = bc.id
@@ -634,11 +642,8 @@
         <where>
             <!-- 若需根据预定日期条件查询，针对换为位操作  -->
                 <!-- yearNo4Where 标识时间参数是否用于where条件 -->
-            <if test=" yearMonthAndParam !=null and yearNo4Where == null">
-                <foreach collection="yearMonthAndParam" index="yearMonth" item="andOperation">
-                and
-                    <include refid="yearMonthAndParamSql"></include>
-                </foreach>
+            <if test=" yearMonthAndParam !=null and yearMonthAndParam != null and yearNo4Where == null">
+                vbi.bit_str = #{yearMonthAndParamBitStr}
             </if>
 
             <!-- 根据前后record 过滤车辆  -->