Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/FailureRepairlogController.java

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
+import com.yeejoin.amos.boot.module.common.api.entity.FailureRepairlog;
 import org.springframework.web.bind.annotation.RequestMapping;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.Api;
@@ -113,4 +114,16 @@ public class FailureRepairlogController extends BaseController {
 	public ResponseModel<List<FailureRepairlogDto>> selectForList() {
 	    return ResponseHelper.buildResponse(failureRepairlogServiceImpl.queryForFailureRepairlogList());
 	}
+
+	/**
+	 * 查询报修日志
+	 *
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "查询报修日志",   notes = "查询报修日志")
+	@GetMapping(value = "/list/{faultId}")
+	public ResponseModel<List<FailureRepairlog>> findByFaultIdLog(@RequestParam Long faultId) {
+		return ResponseHelper.buildResponse(failureRepairlogServiceImpl.findByfaultIdLog(faultId));
+	}
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/FailureRepairlogServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureRepairlog;
 import com.yeejoin.amos.boot.module.common.api.mapper.FailureRepairlogMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IFailureRepairlogService;
@@ -30,4 +32,14 @@ public class FailureRepairlogServiceImpl extends BaseService<FailureRepairlogDto
     public List<FailureRepairlogDto> queryForFailureRepairlogList()   {
         return this.queryForList("" , false);
     }
+
+    /**
+     * 根据FaultId查询
+     */
+    public List<FailureRepairlog> findByfaultIdLog(Long faultId) {
+        Page<FailureRepairlogDto> page = new Page<>();
+        QueryWrapper<FailureRepairlog> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("fault_id", faultId).orderByAsc("process_time");
+        return baseMapper.selectList(queryWrapper);
+    }
 }
\ No newline at end of file