app保养详情修改

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

@@ -33,7 +33,6 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -139,7 +138,6 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
             record.setStatus(CommonEnum.MaintenanceRecordStatus.MAINTENANCE_DOING.getCode());
             record.setWorkerId1(record.getWorkerId1());
             record.setWorkDate(LocalDate.now());
-            record.setStopDate(LocalDateTime.now());
             MaintenancePlan plan = maintenancePlanService.getOne(record.getMtPlanId());
             if (ObjectUtil.isEmpty(plan)) return RestResponse.fail(MessageUtils.get("msg.add.fail"));
             record.setPlanDate(plan.getPlanDate());
@@ -167,10 +165,10 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
      */
     @Transactional(rollbackFor = Exception.class)
     public RestResponse modify(MaintenanceRecordRequest request) {
-        MaintenanceRecord record = detail(request.getId());
-        if (Objects.isNull(record))
+        MaintenanceRecord oldRecord = detail(request.getId());
+        if (Objects.isNull(oldRecord))
             return RestResponse.success(null, MessageUtils.get("msg.record.not.exist"));
-        record.setRecoveryDate(LocalDateTime.now());
+        MaintenanceRecord record = request.getRecord();
         record.setStatus(CommonEnum.MaintenanceRecordStatus.COMPLETE.getCode());
         boolean result = updateById(record);
         if (!result){
@@ -179,6 +177,7 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         MaintenancePlan plan = maintenancePlanService.getOne(record.getMtPlanId());
         if (ObjectUtil.isEmpty(plan)) return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         plan.setStatus(Integer.parseInt(CommonEnum.MaintenancePlanStatus.COMPLETE.getCode()));
+        plan.setWorkDate(LocalDate.now());
         //修改保养计划为完成
         boolean planResult = maintenancePlanService.updateById(plan);
         if (!planResult){