Merge remote-tracking branch 'origin/developer' 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/FailureAuditServiceImpl.java

@@ -57,7 +57,12 @@ public class FailureAuditServiceImpl extends BaseService<FailureAuditDto, Failur
      */
     public FailureAuditDto savemodel(FailureAuditDto model, ReginParams userInfo) throws Exception {
 
-        this.createWithModel(model);
+        if (model.getAuditResult().equals(5)) {
+            model.setAuditTime(new Date());
+            model.setIsDelete(false);
+            this.createWithModel(model);
+            return model;
+        }
         Integer auditResult = model.getAuditResult();
         //根据审核的结果进行业务操作
         if (auditResult.equals(AuditResultEnum.AGREE.getCode())) {

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

@@ -9,6 +9,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Random;
 
+import jdk.internal.org.objectweb.asm.tree.TryCatchBlockNode;
 import org.apache.commons.lang3.ObjectUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -174,14 +175,14 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			if (ObjectUtils.isNotEmpty(failureDetailsDto.getAttachment())) {
 				sourceFileServiceImpl.saveSourceFile(failureDetailsDto.getSequenceNbr(), failureDetailsDto.getAttachment());
 			}
-			/* failureDetailsDto.set */
-			/* failureDetailsDto.set */
+
 			// 发起主表流程 并添加至报修日志
+			failureDetailsDto.setSubmissionTime(new Date());
 			model = this.createWithModel(failureDetailsDto);
 			Long faultId = model.getSequenceNbr();
 			String processAuditor = model.getRecUserName();
 			String processResult = "提交报修单";
-			String processDepartment = null;
+			String processDepartment = "1111";
 			Date processTime = model.getSubmissionTime();
 			repairlog(faultId, processAuditor, processTime, processDepartment, processResult);
 
@@ -189,8 +190,14 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 			failureAuditDto.setAuditor(model.getRecUserName());
 			failureAuditDto.setFaultId(model.getSequenceNbr());
 			failureAuditDto.setAuditOpinion("已发起");
-			failureAuditServiceImpl.savemodel(failureAuditDto, null);
+			failureAuditDto.setAuditTime(new Date());
+			failureAuditDto.setIsDelete(true);
+			failureAuditDto.setAuditResult(5);
+			if (ObjectUtils.isNotEmpty(failureAuditDto)) {
+				failureAuditServiceImpl.savemodel(failureAuditDto, userInfo);
+			}
 		} catch (Exception e) {
+			e.printStackTrace();
 			logger.info("添加故障维修信息到数据库失败");
 			return false;
 			// return CommonResponseUtil.failure("添加失败");
@@ -212,6 +219,7 @@ public class FailureDetailsServiceImpl extends BaseService<FailureDetailsDto, Fa
 		failureRepairlogDto.setProcessTime(processTime);
 		failureRepairlogDto.setProcessDepartment(processDepartment);
 		failureRepairlogDto.setProcessResult(processResult);
+		failureRepairlogDto.setIsDelete(false);
 		failureRepairlogService.createWithModel(failureRepairlogDto);
 	}