电梯扫码，查询维保记录

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

@@ -5,7 +5,7 @@ import cn.com.ty.lift.business.library.dao.entity.model.request.LiftRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.MaintenanceRecord;
 import cn.com.ty.lift.business.maintenance.dao.entity.ScanRecord;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.ScanRecordRequest;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.response.ScanMaintenancePlanResponse;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.ScanMaintenanceRecordResponse;
 import cn.com.ty.lift.business.maintenance.dao.mapper.ScanRecordMapper;
 import cn.com.ty.lift.business.maintenance.service.MaintenanceRecordService;
 import cn.com.ty.lift.business.maintenance.service.ScanRecordService;
@@ -48,13 +48,10 @@ public class ScanRecordController {
      * @param request liftId
      * @return 分页维保记录列表
      */
-    @PostMapping("maintenance/plan")
+    @PostMapping("maintenance/record")
     public RestResponse<Object> maintenanceRecord(@RequestBody ScanRecordRequest request) {
-        IPage<ScanMaintenancePlanResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
-        IPage<ScanMaintenancePlanResponse> record = scanRecordMapper.queryMaintenancePlanByLiftId(page, request.getLiftId());
-        for (ScanMaintenancePlanResponse recordRecord : record.getRecords()) {
-            System.out.println(recordRecord.getId());
-        }
+        IPage<ScanMaintenanceRecordResponse> page = new Page<>(request.getPageNum(), request.getPageSize());
+        IPage<ScanMaintenanceRecordResponse> record = scanRecordMapper.queryMaintenanceRecordByLiftId(page, request.getLiftId());
         return RestResponse.success(record);
     }
 

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/entity/model/response/ScanMaintenancePlanResponse.java

@@ -5,14 +5,13 @@ import lombok.Data;
 import java.time.LocalDateTime;
 
 @Data
-public class ScanMaintenancePlanResponse {
-    private Long id;
+public class ScanMaintenanceRecordResponse {
+    private Long recordId;
     private LocalDateTime planDate;
     private LocalDateTime workDate;
     private String workerName;
     private String maintenanceAdvice;
     private String consumerAdvice;
-    private Long recordId;
     private Integer status;
     private Long liftId;
 }

lift-business-service/src/main/java/cn/com/ty/lift/business/maintenance/dao/mapper/ScanRecordMapper.java

@@ -2,11 +2,10 @@ package cn.com.ty.lift.business.maintenance.dao.mapper;
 
 import cn.com.ty.lift.business.maintenance.dao.entity.ScanRecord;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.ScanLiftInfoResponse;
-import cn.com.ty.lift.business.maintenance.dao.entity.model.response.ScanMaintenancePlanResponse;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.ScanMaintenanceRecordResponse;
 import cn.com.ty.lift.common.constants.ApiConstants;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
@@ -24,7 +23,7 @@ public interface ScanRecordMapper extends BaseMapper<ScanRecord> {
     @Select(ApiConstants.SQL.QUERY_LIFT_INFO_BY_LIFT_ID)
     List<ScanLiftInfoResponse> queryLiftInfoByLiftId(Long liftId);
 
-    @Select(ApiConstants.SQL.QUERY_MAINTENANCE_PLAN_BY_LIFT_ID)
-    IPage<ScanMaintenancePlanResponse> queryMaintenancePlanByLiftId(IPage<ScanMaintenancePlanResponse> page, Long liftId);
+    @Select(ApiConstants.SQL.QUERY_MAINTENANCE_RECORD_BY_LIFT_ID)
+    IPage<ScanMaintenanceRecordResponse> queryMaintenanceRecordByLiftId(IPage<ScanMaintenanceRecordResponse> page, Long liftId);
 
 }

lift-common/src/main/java/cn.com.ty.lift.common/constants/ApiConstants.java

@@ -415,20 +415,19 @@ public class ApiConstants {
                         "  and p.project_status = '2'" +
                         "</script>";
 
-        String QUERY_MAINTENANCE_PLAN_BY_LIFT_ID =
-                "select mp.id                 id," +
-                        "       mp.plan_date          planDate," +
-                        "       mp.work_date          workDate," +
+        String QUERY_MAINTENANCE_RECORD_BY_LIFT_ID =
+                "select mr.id                 recordId," +
+                        "       mr.plan_date          planDate," +
+                        "       mr.work_date          workDate," +
                         "       ui.name               workerName," +
                         "       mr.maintenance_advice maintenanceAdvice," +
                         "       e.advice              consumerAdvice," +
-                        "       mr.id                 recordId,"+
                         "       mr.status             status," +
-                        "       mp.lift_id            liftId" +
-                        "   from maintenance_plan mp" +
-                        "         left join maintenance_record mr on mr.mt_plan_id = mp.id" +
-                        "         left join user_info ui on mp.worker_id = ui.user_id" +
+                        "       mr.lift_id            liftId" +
+                        "   from maintenance_record mr" +
+                        "         left join user_info ui on mr.worker_id = ui.user_id" +
                         "         left join evaluation e on mr.id = e.record_id and e.source = '1'" +
-                        "   where mr.lift_id = #{liftId} order by mp.plan_date desc";
+                        "   where mr.lift_id = #{liftId}" +
+                        "   order by mr.work_date desc";
     }
 }