|
@@ -1137,6 +1137,11 @@ public class ExamStudentServiceImpl implements ExamStudentService {
|
|
Long examStageId = examStudent.getExamStageId();
|
|
Long examStageId = examStudent.getExamStageId();
|
|
|
|
|
|
ExamSettingsCacheBean examBean = ExamCacheTransferHelper.getCachedExam(examId, studentId, examStageId);
|
|
ExamSettingsCacheBean examBean = ExamCacheTransferHelper.getCachedExam(examId, studentId, examStageId);
|
|
|
|
+
|
|
|
|
+ if (end && !ExamType.ONLINE.name().equals(examBean.getExamType())){
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
|
|
+
|
|
if (examBean.getSpecialSettingsEnabled() && examStageId != null
|
|
if (examBean.getSpecialSettingsEnabled() && examStageId != null
|
|
&& ExamSpecialSettingsType.STAGE_BASED == examBean.getSpecialSettingsType()) {
|
|
&& ExamSpecialSettingsType.STAGE_BASED == examBean.getSpecialSettingsType()) {
|
|
ExamStageCacheBean examStage = CacheHelper.getExamStage(examId, examStageId);
|
|
ExamStageCacheBean examStage = CacheHelper.getExamStage(examId, examStageId);
|
|
@@ -1163,7 +1168,7 @@ public class ExamStudentServiceImpl implements ExamStudentService {
|
|
}
|
|
}
|
|
|
|
|
|
OnHandExamInfo examStudentInfo = new OnHandExamInfo();
|
|
OnHandExamInfo examStudentInfo = new OnHandExamInfo();
|
|
- resultList.add(examStudentInfo);
|
|
|
|
|
|
+
|
|
|
|
|
|
examStudentInfo.setExamStudentId(examStudent.getExamStudentId());
|
|
examStudentInfo.setExamStudentId(examStudent.getExamStudentId());
|
|
examStudentInfo.setStudentCode(examStudent.getStudentCode());
|
|
examStudentInfo.setStudentCode(examStudent.getStudentCode());
|
|
@@ -1200,6 +1205,9 @@ public class ExamStudentServiceImpl implements ExamStudentService {
|
|
studentId, ExamProperties.IS_OBJ_SCORE_VIEW.name()).getValue();
|
|
studentId, ExamProperties.IS_OBJ_SCORE_VIEW.name()).getValue();
|
|
if (StringUtils.isBlank(isObjScoreView)) {
|
|
if (StringUtils.isBlank(isObjScoreView)) {
|
|
examStudentInfo.setIsObjScoreView(false);
|
|
examStudentInfo.setIsObjScoreView(false);
|
|
|
|
+ if (end) {
|
|
|
|
+ return;
|
|
|
|
+ }
|
|
} else {
|
|
} else {
|
|
examStudentInfo.setIsObjScoreView(Boolean.valueOf(isObjScoreView));
|
|
examStudentInfo.setIsObjScoreView(Boolean.valueOf(isObjScoreView));
|
|
}
|
|
}
|
|
@@ -1213,6 +1221,8 @@ public class ExamStudentServiceImpl implements ExamStudentService {
|
|
examStudentInfo.setAppExamEnabled(Boolean.valueOf(appExamEnabled));
|
|
examStudentInfo.setAppExamEnabled(Boolean.valueOf(appExamEnabled));
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ resultList.add(examStudentInfo);
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
private Integer countExamTimes(ExamStudentEntity examStudentInfo, ExamSettingsCacheBean examBean) {
|
|
private Integer countExamTimes(ExamStudentEntity examStudentInfo, ExamSettingsCacheBean examBean) {
|