修改车辆排班时间粒度

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/BookVehicleVO.java

@@ -103,4 +103,9 @@ public class BookVehicleVO {
     private String upkeepIds;
 
     private String orderNo;
+
+    /**
+     * 订单状态
+     */
+    private Integer status;
 }
\ No newline at end of file

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

@@ -501,7 +501,6 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         log.info("预定车辆参数：userId = {}, bookVehicleVo = {},username = {}", userId, bookVehicleVo, userName);
         //检查车辆信息是否合法
         checkIfVehicleExists(bookVehicleVo.getVehicleId());
-
         //提取日期和相应的预定目标日期
         Map<String,List<String>> yearMonthAndDate = Maps.newHashMap();
         DateTime startDay =DateTime.parse(bookVehicleVo.getBookStartDate(),DATE_TIME_FORMATTER);
@@ -526,7 +525,7 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
             BeanUtil.copyProperties(bookVehicleVo, vehicleBookRecord, CopyOptions.create().setIgnoreNullValue(true).setIgnoreError(true));
             vehicleBookRecord.setBookStartDate(startDay.toDate());
             vehicleBookRecord.setBookEndDate(endDay.toDate());
-            vehicleBookRecord.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
+            vehicleBookRecord.setStatus(bookVehicleVo.getStatus());
             vehicleBookRecord.setBookUser(userId);
             vehicleBookRecord.setBookUserName(userName);
             vehicleBookRecordBiz.save(vehicleBookRecord);

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

@@ -218,6 +218,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     public RestResponse<Integer> applyVehicle(@RequestBody  BookVehicleVO bookVehicleVo) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
+        bookVehicleVo.setStatus(VehicleBookRecordStatus.APPLY.getCode());
         baseBiz.applyVehicle(operatorId, bookVehicleVo, userName);
         return RestResponse.suc();
     }
@@ -233,7 +234,8 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
     public RestResponse<Integer> applyForVehicle(@RequestBody  BookVehicleVO bookVehicleVo) throws Exception {
         Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
         String userName = BaseContextHandler.getName();
-        baseBiz.applyForVehicle(operatorId, bookVehicleVo, userName);
+        bookVehicleVo.setStatus(VehicleBookRecordStatus.APPLY.getCode());
+        baseBiz.applyVehicle(operatorId, bookVehicleVo, userName);
         return RestResponse.suc();
     }