Commit b8460314 authored by chenzhao's avatar chenzhao

报修日志代码补充

parent 628b11ea
...@@ -50,6 +50,12 @@ public class FailureAudit extends BaseEntity { ...@@ -50,6 +50,12 @@ public class FailureAudit extends BaseEntity {
@TableField("audit_opinion") @TableField("audit_opinion")
private String auditOpinion; private String auditOpinion;
/* *//**
* 审核状态
*//*
@TableField("audit_status")
private String auditStatus;
*/
/** /**
* 设备故障报修单id * 设备故障报修单id
*/ */
......
...@@ -58,6 +58,11 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F ...@@ -58,6 +58,11 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_ACCEPTANCE.getCode()); failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_ACCEPTANCE.getCode());
failureDetailsService.updateWithModel(failureDetailsDto); failureDetailsService.updateWithModel(failureDetailsDto);
//添加报修日志
String processResult = "维修完成";
repairlog(failureMaintainDto.getFaultId(),failureMaintainDto.getMaintainMan(),failureMaintainDto.getMaintainTime(),
failureMaintainDto.getDepartment(),processResult);
sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),failureMaintainDto.getAttachment()); sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),failureMaintainDto.getAttachment());
return failureMaintainDto; return failureMaintainDto;
} }
...@@ -79,14 +84,21 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F ...@@ -79,14 +84,21 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,F
this.updateWithModel(failureMaintainDto); this.updateWithModel(failureMaintainDto);
//根据status修改状态 //根据status修改状态
String processResult = new String();
FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId()); FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
if (status == AuditResultEnum.AGREE.getCode()) {//同意状态为已完结 if (status == AuditResultEnum.AGREE.getCode()) {//同意状态为已完结
failureDetailsDto.setCurrentStatus(FailureStatuEnum.FINISH.getCode()); failureDetailsDto.setCurrentStatus(FailureStatuEnum.FINISH.getCode());
failureDetailsService.updateWithModel(failureDetailsDto); failureDetailsService.updateWithModel(failureDetailsDto);
processResult = "验证通过";
}else {//不同意状态为已拒绝 }else {//不同意状态为已拒绝
failureDetailsDto.setCurrentStatus(FailureStatuEnum.REFUSE.getCode()); failureDetailsDto.setCurrentStatus(FailureStatuEnum.REFUSE.getCode());
failureDetailsService.updateWithModel(failureDetailsDto); failureDetailsService.updateWithModel(failureDetailsDto);
processResult = "验证未通过";
} }
//添加报修日志
repairlog(failureMaintainDto.getFaultId(),failureMaintainDto.getMaintainMan(),failureMaintainDto.getMaintainTime(),
failureMaintainDto.getDepartment(),processResult);
return failureMaintainDto; return failureMaintainDto;
} }
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment