|
@@ -4,7 +4,6 @@ import cn.hutool.core.date.DateUtil;
|
|
|
import com.alibaba.fastjson.JSONArray;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.aliyun.oss.common.utils.BinaryUtil;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
@@ -255,12 +254,11 @@ public class TEExamServiceImpl extends ServiceImpl<TEExamMapper, TEExam> impleme
|
|
|
TOeExamRecord tOeExamRecord = null;
|
|
|
if (Objects.nonNull(currentRecordId)) {
|
|
|
tOeExamRecord = toeExamRecordService.getCacheExamRecord(currentRecordId);
|
|
|
+ if (Objects.isNull(tOeExamRecord)) {
|
|
|
+ tOeExamRecord = toeExamRecordService.getExamRecordForDb(examId, activityId, examStudentId, ExamRecordStatusEnum.FIRST_PREPARE);
|
|
|
+ }
|
|
|
} else {
|
|
|
- QueryWrapper<TOeExamRecord> tOeExamRecordQueryWrapper = new QueryWrapper<>();
|
|
|
- tOeExamRecordQueryWrapper.lambda().eq(TOeExamRecord::getExamId, examId)
|
|
|
- .eq(TOeExamRecord::getExamActivityId, activityId).eq(TOeExamRecord::getExamStudentId, examStudentId)
|
|
|
- .eq(TOeExamRecord::getStatus, ExamRecordStatusEnum.FIRST_PREPARE);
|
|
|
- tOeExamRecord = toeExamRecordService.getOne(tOeExamRecordQueryWrapper);
|
|
|
+ tOeExamRecord = toeExamRecordService.getExamRecordForDb(examId, activityId, examStudentId, ExamRecordStatusEnum.FIRST_PREPARE);
|
|
|
}
|
|
|
if (Objects.nonNull(tOeExamRecord) && Objects.nonNull(tOeExamRecord.getStatus()) && (ExamRecordStatusEnum.FINISHED == tOeExamRecord.getStatus() || ExamRecordStatusEnum.PERSISTED == tOeExamRecord.getStatus() || tOeExamRecord.getStatus() == ExamRecordStatusEnum.JUNK)) {
|
|
|
throw new BusinessException(ExceptionResultEnum.EXAM_FINISH);
|