修改租车列表新规则bug

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

@@ -1156,8 +1156,10 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         List<String> notBookedDates = Lists.newArrayList();
         if(StringUtils.isNotBlank(dto.getStartDate())&&
                 StringUtils.isNotBlank(dto.getEndDate())) {
-            notBookedDates = convertDatePeriod2List(dto.getStartDate(),
-                    dto.getEndDate());
+//            notBookedDates = convertDatePeriod2List(dto.getStartDate(),
+//                    dto.getEndDate());
+            notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
+                    dto.getEndDateExtend());
         }
 
         //若传入预定信息查询条件，则查询对应月份预定信息查询条件（不超过3个月）

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

@@ -639,9 +639,9 @@
                 <!-- yearNo4Where 标识时间参数是否用于where条件 -->
             <if test="startCompanyId != null and endCompanyId != null ">
                 and (
-                    (abr.to_lift_company = null or abr.to_lift_company = #{startCompanyId})
+                    (abr.to_lift_company is null or abr.to_lift_company = #{startCompanyId})
                     and
-                    (abr.to_return_company = null or abr.to_return_company = #{endCompanyId})
+                    (abr.to_return_company is null or abr.to_return_company = #{endCompanyId})
                 )
             </if>
             <if test=" modelId != null ">