|
@@ -1822,13 +1822,10 @@ public class ExamControlServiceImpl implements ExamControlService {
|
|
//考试总时长
|
|
//考试总时长
|
|
// long examTotalMilliSeconds = calcExamTotalMilliSeconds(examingSession.getExamRecordDataId());
|
|
// long examTotalMilliSeconds = calcExamTotalMilliSeconds(examingSession.getExamRecordDataId());
|
|
//如果开启场次,并且设置了定点交卷,且已到定点收卷时间,则不需要校验冻结时间,直接返回考试时长
|
|
//如果开启场次,并且设置了定点交卷,且已到定点收卷时间,则不需要校验冻结时间,直接返回考试时长
|
|
- boolean isTimingEnd=isTimingEnd(examingSession.getExamId(), studentId, examingSession.getExamStageId());
|
|
|
|
- long fixedSubmitTime=examingSession.getFixedSubmitTime().getTime();
|
|
|
|
- long now =new Date().getTime();
|
|
|
|
- if (isTimingEnd&& fixedSubmitTime<=now) {
|
|
|
|
|
|
+ if (isTimingEnd(examingSession.getExamId(), studentId, examingSession.getExamStageId())
|
|
|
|
+ && examingSession.getFixedSubmitTime().getTime()<=new Date().getTime()) {
|
|
return examUsedMilliSeconds;
|
|
return examUsedMilliSeconds;
|
|
}
|
|
}
|
|
- log.error("checkAndComputeExamDuration error:"+isTimingEnd+"-"+fixedSubmitTime+"-"+now);
|
|
|
|
|
|
|
|
// 如果没有超过冻结时间,抛出异常
|
|
// 如果没有超过冻结时间,抛出异常
|
|
if (ExamType.ONLINE.name().equals(examingSession.getExamType())
|
|
if (ExamType.ONLINE.name().equals(examingSession.getExamType())
|