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

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

@@ -55,7 +55,7 @@ public class ScanRecordController {
         return RestResponse.success(record);
     }
 
-    //维保list结构
+    //维保项list结构
     @PostMapping("maintenance/option/list")
     public RestResponse<?> listOptions(@RequestBody ScanRecordRequest request) {
         String sort;
@@ -69,7 +69,7 @@ public class ScanRecordController {
             default:
                 sort = null;
         }
-        return RestResponse.success(maintenanceOptionService.list(Wrappers.<MaintenanceOption>query().eq(sort != null, "sort", sort)));
+        return RestResponse.success(maintenanceOptionService.list(Wrappers.<MaintenanceOption>query().in(sort != null, "sort", sort)));
     }
 
     //查看保养单
@@ -82,7 +82,9 @@ public class ScanRecordController {
 
     //查看保养图片
     @PostMapping("maintenance/images")
-    public RestResponse<?> images(@RequestBody MtRecordRequest request) {
+    public RestResponse<?> images(@RequestBody ScanRecordRequest scanRecordRequest) {
+        MtRecordRequest request = new MtRecordRequest();
+        request.setId(scanRecordRequest.getRecordId());
         return maintenanceRecordController.images(request);
     }
 

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

@@ -409,8 +409,8 @@ public class ApiConstants {
                         "       mr.maintenance_advice maintenanceAdvice," +
                         "       e.advice              consumerAdvice," +
                         "       mr.status             status," +
-                        "       mr.lift_id            liftId" +
-                        "       mr.lift_type          liftType," +
+                        "       mr.lift_id            liftId," +
+                        "       mr.lift_type          liftType" +
                         "   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'" +