Merge branch 'master-zjw' into dev

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

@@ -1204,6 +1204,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             }else {
                 notBookedDates = convertDatePeriod2List(dto.getStartDate(),
                     dto.getEndDate());
+                dto.setStartDateExtend(dto.getStartDate());
+                dto.setEndDateExtend(dto.getEndDate());
             }
         }
 
@@ -1237,6 +1239,8 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
                 StringUtils.isNotBlank(dto.getBookEndDate())) {
             notBookedDates = convertDatePeriod2List(dto.getBookStartDate(),
                     dto.getBookEndDate());
+            dto.setStartDateExtend(dto.getBookStartDate());
+            dto.setEndDateExtend(dto.getBookEndDate());
 //            notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
 //                    dto.getEndDateExtend());
         }

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

@@ -807,14 +807,14 @@
         </if>
         <!-- yearNo4Where 标识时间参数不用于where条件，用于select部分 -->
         <if test=" yearMonthAndParam !=null and yearNo4Where != null and yearNo4Where == true">
-            ,(ifnull(max(
-                vbi.bit_str = #{yearMonthAndParamBitStr}
+            ,(max(
+                ifnull(vbi.bit_str = #{yearMonthAndParamBitStr}, false)
                 <!-- 租车列表 不过滤前后预约记录不符的车辆 但是合并标示车型是否有车 即 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>
-                ), 1)
+                )
             ) as hasVehicle
         </if>
         <if test="lon != null and lat != null">