merge new

examcloud-core-oe-admin-api-provider/src/main/java/cn/com/qmth/examcloud/core/oe/admin/api/provider/SyncExamDataCloudServiceProvider.java

@@ -131,6 +131,12 @@ public class SyncExamDataCloudServiceProvider extends ControllerSupport implemen
         //同步考试记录,并返回真实的考试记录id
         Long realExamRecordDataId = syncExamRecordData(transitionExamRecordData);
 
+        //header校验错误
+        Boolean hasWarn = redisClient.get("OE_SESSION_WARN_"+transitionExamRecordDataId, Boolean.class);
+        if(hasWarn !=null && hasWarn){
+            examAuditService.saveHeaderWarnAudit(realExamRecordDataId);
+        }
+
         startTime = this.debugCost("3 同步考试记录表", transitionExamRecordDataId, startTime);
 
         //添加同步记录
@@ -210,12 +216,6 @@ public class SyncExamDataCloudServiceProvider extends ControllerSupport implemen
             saveAutoAudit(transitionExamRecordData, isNoPhotoAndIllegality, realExamRecordDataId);
         }
 
-        //header校验错误
-        Boolean hasWarn = redisClient.get("OE_SESSION_WARN_"+transitionExamRecordDataId, Boolean.class);
-        if(hasWarn !=null && hasWarn){
-            examAuditService.saveHeaderWarnAudit(realExamRecordDataId);
-        }
-
         startTime = this.debugCost("13 如果开启了活检,计算违纪自动审核结果", transitionExamRecordDataId, startTime);
 
         //同步后续处理

examcloud-core-oe-admin-service/src/main/java/cn/com/qmth/examcloud/core/oe/admin/service/impl/ExamAuditServiceImpl.java

@@ -47,6 +47,7 @@ import javax.persistence.Query;
 import java.math.BigInteger;
 import java.util.Date;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static cn.com.qmth.examcloud.core.oe.admin.service.bean.examaudit.ExamAuditMapper.EXAM_RECORD_DATA_ID;
@@ -410,6 +411,16 @@ public class ExamAuditServiceImpl implements ExamAuditService {
         examAuditEntity.setAuditUserName(AUDIT_USER_NAME);
         examAuditEntity.setStatus(AuditStatus.UN_PASS);
         examAuditRepo.save(examAuditEntity);
+
+        //同时该考试记录为违纪、异常、已审
+        Optional<ExamRecordDataEntity> byId = examRecordDataRepo.findById(realExamRecordDataId);
+        if(byId.isPresent()){
+            ExamRecordDataEntity entity = byId.get();
+            entity.setIsIllegality(true);
+            entity.setIsWarn(true);
+            entity.setIsAudit(true);
+            examRecordDataRepo.save(entity);
+        }
     }
 
     //获取活检违纪详情