Merge branch 'feature-bieao' of lift-manager/lift-server into develop

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

@@ -138,7 +138,7 @@ public class MaintenancePlanService extends ServiceImpl<MaintenancePlanMapper, M
     public MaintenancePlan getOne(Long id) {
         LambdaQueryWrapper<MaintenancePlan> lambdaQueryWrapper = new QueryWrapper<MaintenancePlan>().lambda();
         lambdaQueryWrapper.eq(MaintenancePlan::getId, id);
-        return Optional.ofNullable(getOne(lambdaQueryWrapper)).orElse(null);
+        return getOne(lambdaQueryWrapper);
     }
 
     /**

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

@@ -26,7 +26,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.gson.Gson;
 import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
@@ -45,6 +47,7 @@ import java.util.stream.Collectors;
  * @description 保养记录业务层
  */
 @Service
+@Slf4j
 @AllArgsConstructor
 public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMapper, MaintenanceRecord> {
 
@@ -55,6 +58,8 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
     private MaintenancePlanService maintenancePlanService;
     private EvaluationService      evaluationService;
 
+    private Gson gson;
+
     /**
      * @param request 公司id和电梯id
      * @return RestResponse 保养信息
@@ -175,6 +180,8 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         if (!result){
             return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         }
+        log.info("维保记录：" + gson.toJson(oldRecord));
+        log.info("维保计划id：" + oldRecord.getMtPlanId());
         MaintenancePlan plan = maintenancePlanService.getOne(oldRecord.getMtPlanId());
         if (ObjectUtil.isEmpty(plan)) return RestResponse.fail(MessageUtils.get("msg.modify.fail"));
         plan.setStatus(Integer.parseInt(CommonEnum.MaintenancePlanStatus.COMPLETE.getCode()));