Merge branch 'wanghaicheng' of lift-manager/lift-server into develop

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/service/MaintenanceRecordService.java

@@ -255,9 +255,10 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
             rollback();
             return RestResponse.fail(MessageUtils.get("msg.add.fail"));
         }
-        //超期保养，不修改保养计划
-        boolean compareResult = request.getCurrentTime().isAfter(plan.getPlanDate());
-        if (!compareResult) {
+        //若保养时间在计划时间之前，提前保养，则需要修改维保计划
+        //若保养时间在计划时间之后，超期保养，不需要修改保养计划
+        if (request.getCurrentTime().isBefore(plan.getPlanDate()) ||
+                !request.getCurrentTime().isAfter(plan.getPlanDate())) {
             boolean modifyPlan = modifyPlan(request);
             if (!modifyPlan) {
                 return RestResponse.fail(MessageUtils.get("msg.modify.fail"));