Merge branch 'master' of http://git.qmth.com.cn/ExamCloud-3/examcloud-core-oe-admin.git

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

@@ -121,7 +121,10 @@ public class SyncExamDataCloudServiceProvider extends ControllerSupport implemen
         Long examScoreId = syncExamScore(transitionExamRecordData, realExamRecordDataId);
 
         //计算最终分数
-        examStudentFinalScoreService.calcAndSaveFinalScore(examStudentId);
+        String examType = ExamCacheTransferHelper.getDefaultCachedExam(transitionExamRecordData.getExamId()).getExamType();
+        if (ExamType.ONLINE.name().equals(examType) || ExamType.OFFLINE.name().equals(examType)) {
+            examStudentFinalScoreService.calcAndSaveFinalScore(examStudentId);
+        }
 
         //同步抓拍照片结果（同步抓拍的数据）
         if (null != req.getExamSyncCapture()) {
@@ -238,7 +241,7 @@ public class SyncExamDataCloudServiceProvider extends ControllerSupport implemen
 
         ExamRecordDataEntity examRecordDataEntity = copyExamRecordDataEntityFrom(examRecordData);
 
-        ExamRecordDataEntity result = examRecordDataRepo.save(examRecordDataEntity);
+        ExamRecordDataEntity result = examRecordDataRepo.saveAndFlush(examRecordDataEntity);
 
         return result.getId();
     }