修改代码

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

@@ -255,7 +255,7 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
         rbd.setCatas2(dto.getCatas());
         rbd.setGoodsType(dto.getGoodsType());
         rbd.setRecordIntersection(Boolean.FALSE);
-        rbd.setYearNo4Where(Boolean.TRUE);
+        rbd.setYearNo4Where(Boolean.FALSE);
         //查询可车辆信息
         PageDataVO<UsableVeicleVO> pageDataVO = vehicleBiz.searchUsableVehicle(rbd);
         if(CollUtil.isNotEmpty(pageDataVO.getData())) {
@@ -288,10 +288,10 @@ public class RentVehicleController extends BaseController<VehicleBiz> implements
     @RequestMapping(value = "/rent/apply/usable-vehicle", method = RequestMethod.POST)
     @IgnoreUserToken
     public ObjectRestResponse<PageDataVO<UsableVeicleVO>> applyUsableVehicle(@RequestBody RentVehicleBookDTO rbd) {
-        rbd.setRecordIntersection(Boolean.TRUE);
+        rbd.setRecordIntersection(Boolean.FALSE);
         rbd.setLimit(100);
         rbd.setPage(1);
-        rbd.setYearNo4Where(Boolean.TRUE);
+        rbd.setYearNo4Where(Boolean.FALSE);
 
         //查询可车辆信息
         PageDataVO<UsableVeicleVO> pageDataVO = vehicleBiz.searchUsableVehicle(rbd);

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

@@ -1212,7 +1212,7 @@
         <where>
             <!-- 若需根据预定日期条件查询，针对换为位操作  -->
                 <!-- yearNo4Where 标识时间参数是否用于where条件 -->
-            <if test=" yearMonthAndParam !=null and yearMonthAndParam != null and yearNo4Where == null">
+            <if test=" yearMonthAndParam !=null and yearMonthAndParam != null and (yearNo4Where == null or yearNo4Where != true)">
                 vbi.bit_str = #{yearMonthAndParamBitStr}
             </if>