|
@@ -255,14 +255,14 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
|
|
|
rollback();
|
|
|
return RestResponse.fail(MessageUtils.get("msg.add.fail"));
|
|
|
}
|
|
|
- //若保养时间在计划时间之前,则需要修改维保计划
|
|
|
- //boolean compareResult = request.getCurrentTime().isBefore(plan.getPlanDate());
|
|
|
- //if (compareResult) {
|
|
|
- boolean modifyPlan = modifyPlan(request);
|
|
|
- if (!modifyPlan) {
|
|
|
- return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
|
|
|
+ //超期保养,不修改保养计划
|
|
|
+ boolean compareResult = request.getCurrentTime().isAfter(plan.getPlanDate());
|
|
|
+ if (!compareResult) {
|
|
|
+ boolean modifyPlan = modifyPlan(request);
|
|
|
+ if (!modifyPlan) {
|
|
|
+ return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
|
|
|
+ }
|
|
|
}
|
|
|
- //}
|
|
|
Optional<Lift> lift = liftService.getOne(null, liftId);
|
|
|
if (lift.isPresent()) {
|
|
|
Lift l = lift.get();
|