提前保养问题修复

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

@@ -165,11 +165,6 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         maintenancePlanService.removeByIds(planList.stream().map(MaintenancePlan::getId).collect(Collectors.toList()));
         //按照修改时间重新生成计划
         List<MaintenancePlan> plans = maintenancePlanService.generatePlan(plan, periods, interval, request.getCurrentTime(), endDate);
-        for (MaintenancePlan p : plans) {
-            if (request.getCurrentTime().equals(p.getPlanDate())) {
-                p.setStatus(Integer.parseInt(CommonEnum.MaintenancePlanStatus.MAINTENANCE_DOING.getCode()));
-            }
-        }
         return maintenancePlanService.saveBatch(plans, plans.size());
     }
 
@@ -205,6 +200,13 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
             return RestResponse.fail(MessageUtils.get("msg.error.person.scope"));
         MaintenancePlan plan = maintenancePlanService.getOne(record.getMtPlanId());
         if (ObjectUtil.isEmpty(plan)) return RestResponse.fail(MessageUtils.get("msg.maintenance.plan.not.exist"));
+
+        plan.setStatus(Integer.parseInt(CommonEnum.MaintenancePlanStatus.MAINTENANCE_DOING.getCode()));
+        boolean planResult = maintenancePlanService.updateById(plan);
+        if (!planResult) {
+            rollback();
+            return RestResponse.fail(MessageUtils.get("msg.add.fail"));
+        }
         //若保养时间在计划时间之前，则需要修改维保计划
         boolean compareResult = request.getCurrentTime().isBefore(plan.getPlanDate());
         if (compareResult) {
@@ -212,13 +214,6 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
             if (!modifyPlan) {
                 return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
             }
-        } else {
-            plan.setStatus(Integer.parseInt(CommonEnum.MaintenancePlanStatus.MAINTENANCE_DOING.getCode()));
-            boolean planResult = maintenancePlanService.updateById(plan);
-            if (!planResult) {
-                rollback();
-                return RestResponse.fail(MessageUtils.get("msg.add.fail"));
-            }
         }
         Optional<Lift> lift = liftService.getOne(null, liftId);
         if (lift.isPresent()) {