Merge branch 'developer' of http://39.98.45.134:8090/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/service/impl/FailureMaintainServiceImpl.java

@@ -143,24 +143,24 @@ public class FailureMaintainServiceImpl extends BaseService<FailureMaintainDto,
             if (!result) {
                 return false;
             }
-            failureMaintainDto.setMaintainMan(userInfo.getUserModel().getRealName());
+        failureMaintainDto.setMaintainMan(userInfo.getUserModel().getRealName());
             failureMaintainDto.setMaintainTime(new Date());
             String parentId = iOrgUsrService.getParentId(userInfo.getUserModel().getUserId());
             OrgUsr orgUsr = iOrgUsrService.getById(parentId);
             failureMaintainDto.setDepartment(orgUsr.getBizOrgName());
             failureMaintainDto.setBizId(userInfo.getDepartment().getSequenceNbr());
             failureMaintainDto.setRecoreType(RECORE_TYPE);
-            this.createWithModel(failureMaintainDto);
+         //   this.createWithModel(failureMaintainDto);
             // 添加完成后修改保修单状态为维修完成
             FailureDetailsDto failureDetailsDto = failureDetailsService.queryBySeq(failureMaintainDto.getFaultId());
             failureDetailsDto.setCurrentStatus(FailureStatuEnum.WAITING_ACCEPTANCE.getCode());
             failureDetailsService.updateWithModel(failureDetailsDto);
             // 添加报修日志
             String processResult = MAINTENANCE_STATUS[0];// 维修完成
-            Integer processAuditorId = Integer.parseInt(failureMaintainDto.getRecUserId());
+            Integer processAuditorId = Integer.parseInt(userInfo.getUserModel().getUserId());
             String processAuditorName = userInfo.getUserModel().getRealName();
             repairlog(failureMaintainDto.getFaultId(),  processAuditorId,
-                    userInfo.getDepartment().getSequenceNbr(), failureMaintainDto.getMaintainTime(),
+                    userInfo.getDepartment().getSequenceNbr(), new Date(),
                     failureMaintainDto.getDepartment(), processResult, processAuditorName);
             if (ObjectUtils.isNotEmpty(failureMaintainDto.getAttachment())) {
                 sourceFileServiceImpl.saveSourceFile(failureMaintainDto.getSequenceNbr(),