Commit 532bcc51 authored by 周健威's avatar 周健威

Merge branch 'feature-delay-add' into dev

parents 2b0f6481 7392b0bf
...@@ -164,6 +164,7 @@ public class OrderDelayBiz { ...@@ -164,6 +164,7 @@ public class OrderDelayBiz {
setBookStartDateTime(dto.getBookStartDateTime()); setBookStartDateTime(dto.getBookStartDateTime());
setBookEndDateTime(dto.getBookEndDateTime()); setBookEndDateTime(dto.getBookEndDateTime());
setBookType(BOOK_TYPE_RENT); setBookType(BOOK_TYPE_RENT);
set
}}); }});
if( !SYS_JSON_TRUE.equals(restResponse.getStatus())) { if( !SYS_JSON_TRUE.equals(restResponse.getStatus())) {
......
...@@ -224,7 +224,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use ...@@ -224,7 +224,7 @@ public class VehicleController extends BaseController<VehicleBiz> implements Use
Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID()); Integer operatorId = Integer.parseInt(BaseContextHandler.getUserID());
String userName = BaseContextHandler.getName(); String userName = BaseContextHandler.getName();
bookVehicleVo.setStatus(VehicleBookRecordStatus.APPROVE.getCode()); bookVehicleVo.setStatus(VehicleBookRecordStatus.APPROVE.getCode());
bookVehicleVo.setNotCheckTimeLegal(Boolean.FALSE); bookVehicleVo.setNotCheckTimeLegal(Boolean.TRUE);
baseBiz.applyVehicle(operatorId, bookVehicleVo, userName); baseBiz.applyVehicle(operatorId, bookVehicleVo, userName);
return RestResponse.suc(); return RestResponse.suc();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment