修改后台下单查询可用车辆

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

@@ -1209,7 +1209,15 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
     public PageDataVO<UsableVehicleModelVO> searchUsableModel(UsableVeicleDTO dto) {
         Map<String, Object> params = BeanUtil.beanToMap(dto);
         if (StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
-            initBookSearchParam(dto, params);
+            initBookSearchParam(dto, params, Boolean.TRUE);
+        }
+        return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
+    }
+
+    public PageDataVO<UsableVehicleModelVO> searchUsableModelBackStage(UsableVeicleDTO dto) {
+        Map<String, Object> params = BeanUtil.beanToMap(dto);
+        if (StrUtil.isNotBlank(dto.getStartDate()) && StrUtil.isNotBlank(dto.getEndDate())) {
+            initBookSearchParam(dto, params, Boolean.FALSE);
         }
         return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
     }
@@ -1220,14 +1228,17 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         return PageDataVO.pageInfo(dto.getPage(), dto.getLimit(), () -> mapper.searchUsableModel(params));
     }
 
-    private void initBookSearchParam(UsableVeicleDTO dto, Map<String, Object> params) {
+    private void initBookSearchParam(UsableVeicleDTO dto, Map<String, Object> params, Boolean needDateExtend) {
         List<String> notBookedDates = Lists.newArrayList();
         if (StringUtils.isNotBlank(dto.getStartDate()) &&
                 StringUtils.isNotBlank(dto.getEndDate())) {
-//            notBookedDates = convertDatePeriod2List(dto.getStartDate(),
-//                    dto.getEndDate());
+            if(needDateExtend) {
                 notBookedDates = convertDatePeriod2List(dto.getStartDateExtend(),
                         dto.getEndDateExtend());
+            }else {
+                notBookedDates = convertDatePeriod2List(dto.getStartDate(),
+                    dto.getEndDate());
+            }
         }
 
         //若传入预定信息查询条件，则查询对应月份预定信息查询条件（不超过3个月）

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/RentVehicleController.java

@@ -143,7 +143,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         //设置显示是否有车
         dto.setYearNo4Where(Boolean.TRUE);
         dto.setUseType(null);
-        return ObjectRestResponse.succ(vehicleBiz.searchUsableModel(dto));
+        return ObjectRestResponse.succ(vehicleBiz.searchUsableModelBackStage(dto));
     }
 
     /**