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

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

@@ -0,0 +1,20 @@
+package cn.com.ty.lift.business.maintenance.dao.entity.model.response;
+
+import cn.com.ty.lift.business.maintenance.dao.entity.MaintenanceRecord;
+import cn.com.ty.lift.business.maintenance.dao.entity.MtRecordImg;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author bieao
+ * @date 2020/5/6
+ * @description 保养详情
+ */
+@Data
+public class MaintenanceRecordDetailResponse {
+
+    private MaintenanceRecord record;
+
+    private List<MtRecordImg> recordImageList;
+}

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

@@ -12,6 +12,7 @@ import cn.com.ty.lift.business.maintenance.dao.entity.MtRecordCost;
 import cn.com.ty.lift.business.maintenance.dao.entity.MtRecordImg;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceRecordRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MtRecordRequest;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenanceRecordDetailResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenanceRecordResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MtRecordResponse;
 import cn.com.ty.lift.business.maintenance.dao.mapper.MaintenanceRecordMapper;
@@ -191,6 +192,21 @@ public class MaintenanceRecordService extends ServiceImpl<MaintenanceRecordMappe
         return getById(id);
     }
 
+    /**
+     * @param id 保养记录id
+     * @return 保养信息详情
+     * @description 查看保养信息详情
+     * @date 2020/1/13 2:39 下午
+     */
+    public MaintenanceRecordDetailResponse queryById(Long id) {
+        MaintenanceRecord record = getById(id);
+        List<MtRecordImg> imgList = mtRecordImgService.listByRecord(id);
+        MaintenanceRecordDetailResponse response = new MaintenanceRecordDetailResponse();
+        response.setRecord(record);
+        response.setRecordImageList(imgList);
+        return response;
+    }
+
     /**
      * 根据条件分页查询维保-日常保养
      * @author wcz

lift-business-service/src/main/java/cn/com/ty/lift/business/project/controller/ProjectAppController.java

@@ -5,10 +5,10 @@ import cn.com.ty.lift.business.capital.service.CapitalRepairService;
 import cn.com.ty.lift.business.capital.service.SignInService;
 import cn.com.ty.lift.business.framework.util.MessageUtils;
 import cn.com.ty.lift.business.library.dao.entity.model.request.LiftExtensionRequest;
-import cn.com.ty.lift.business.maintenance.dao.entity.MaintenanceRecord;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.MaintenanceCount;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.request.MaintenanceRecordRequest;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenanceAppResponse;
+import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenanceRecordDetailResponse;
 import cn.com.ty.lift.business.maintenance.dao.entity.model.response.MaintenanceRecordResponse;
 import cn.com.ty.lift.business.maintenance.service.MaintenanceRecordService;
 import cn.com.ty.lift.business.project.dao.entity.model.ProjectAppUser;
@@ -32,7 +32,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.Map;
 
 /**
  * @author bieao
@@ -133,7 +132,7 @@ public class ProjectAppController {
     @PostMapping("record/detail")
     @Validation(fields = {"id"})
     public RestResponse detail(@Val @RequestBody MaintenanceRecordRequest request) {
-        MaintenanceRecord record = maintenanceRecordService.detail(request.getId());
+        MaintenanceRecordDetailResponse record = maintenanceRecordService.queryById(request.getId());
         if (ObjectUtil.isEmpty(record)) {
             return RestResponse.success();
         }