*)故障维修新建默认添加一条已发起审核记录 修改维修 审核记录查询接口 分页查询添加状态值

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

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureAuditDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FailureAuditServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -86,6 +87,18 @@ public class FailureAuditController extends BaseController {
 	public ResponseModel<List<FailureAuditDto>> selectForList() {
 	    return ResponseHelper.buildResponse(failureAuditServiceImpl.queryForFailureAuditList());
 	}
+
+	/**
+	 * 审核列表记录查询
+	 *根据关联主表faultId查询
+	 * @return
+	 */
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@ApiOperation(httpMethod = "GET",value = "审核列表记录查询",   notes = "审核列表记录查询")
+	@GetMapping(value = "/list/{faultId}")
+	public ResponseModel<List<FailureAudit>> findByFaultIDFotList(@RequestParam long faultId) {
+		return ResponseHelper.buildResponse(failureAuditServiceImpl.findByfaultId(faultId));
+	}
 	
    
 	

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

@@ -121,11 +121,11 @@ public class FailureDetailsController extends BaseController {
 	@GetMapping(value = "/page")
 	@ApiOperation(httpMethod = "GET",value = "分页查询",  notes = "分页查询")
 	public ResponseModel<Page<FailureDetailsDto>> queryForPage(@RequestParam(value = "current") int current,@RequestParam
-                    (value = "size") int size) {
+                    (value = "size") int size,@RequestParam Long currentStatus) {
 	    Page<FailureDetailsDto> page = new Page<FailureDetailsDto>();
 	    page.setCurrent(current);
 	    page.setSize(size);
-	    return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsPage(page));
+	    return ResponseHelper.buildResponse(failureDetailsServiceImpl.queryForFailureDetailsPage(page,currentStatus));
 	}
 
 	/**

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

@@ -2,6 +2,8 @@ package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
 import java.util.List;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureDetails;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -73,8 +75,18 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
 		failureDetailsDto.setCurrentStatus(status);
 		failureDetailsDto.setSequenceNbr(model.getFaultId());
 		return failureDetailsService.updateWithModel(failureDetailsDto);
+	}
 
+	/**
+	 * 根据FaultId查询
+	 */
+	public List<FailureAudit> findByfaultId(Long faultId) {
+		Page<FailureAudit> page = new Page<>();
+		QueryWrapper<FailureAudit> queryWrapper = new QueryWrapper<>();
+		queryWrapper.eq("fault_id", faultId).orderByDesc("submission_time");
+		return baseMapper.selectList(queryWrapper);
 	}
+
 	 public FailureAudit findByFaultId(Long faultId) {
 		 LambdaQueryWrapper<FailureAudit> wrapper = new LambdaQueryWrapper<FailureAudit>();
 		 wrapper.eq(FailureAudit::getIsDelete, false);

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

@@ -7,6 +7,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
+import com.yeejoin.amos.boot.module.common.api.dto.FailureAuditDto;
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -51,6 +52,9 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	private String processDefinitionKey;
 
 	@Autowired
+	FailureAuditServiceImpl failureAuditServiceImpl;
+
+	@Autowired
 	IFailureAuditService failureAuditService;
 
 	public static String EMERGENCY_COMMAND = "应急指挥科";
@@ -60,8 +64,8 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 	/**
 	 * 分页查询
 	 */
-	public Page<FailureDetailsDto> queryForFailureDetailsPage(Page<FailureDetailsDto> page) {
-		return this.queryForPage(page, null, false);
+	public Page<FailureDetailsDto> queryForFailureDetailsPage(Page<FailureDetailsDto> page,Long currentStatus) {
+		return this.queryForPage(page, null, false,currentStatus);
 	}
 
 	/**
@@ -110,6 +114,11 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 						failureDetailsDto.getAttachment());
 			}
 			model = this.createWithModel(failureDetailsDto);
+			FailureAuditDto failureAuditDto = new FailureAuditDto();
+			failureAuditDto.setAuditor(model.getRecUserName());
+			failureAuditDto.setFaultId(model.getSequenceNbr());
+			failureAuditDto.setAuditOpinion("已发起");
+			failureAuditServiceImpl.savemodel(failureAuditDto);
 		} catch (Exception e) {
 			logger.info("添加故障维修信息到数据库失败");
 			return false;

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

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureDetailsDto;
 import com.yeejoin.amos.boot.module.common.api.dto.FailureMaintainDto;
+import com.yeejoin.amos.boot.module.common.api.entity.FailureAudit;
 import com.yeejoin.amos.boot.module.common.api.entity.FailureMaintain;
 import com.yeejoin.amos.boot.module.common.api.enums.AuditResultEnum;
 import com.yeejoin.amos.boot.module.common.api.enums.FailureStatuEnum;
@@ -57,6 +59,16 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
     }
 
     /**
+     * 根据FaultId查询
+     */
+    public List<FailureMaintain> findByfaultId(Long faultId) {
+        Page<FailureMaintain> page = new Page<>();
+        QueryWrapper<FailureMaintain> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("fault_id", faultId).orderByDesc("submission_time");
+        return baseMapper.selectList(queryWrapper);
+    }
+
+    /**
      *根据审核结果更新维修表
      */
     public FailureMaintainDto updateModel(FailureMaintainDto failureMaintainDto,Integer status)   {