|
@@ -194,14 +194,19 @@ public class ExamStudentServiceImpl implements ExamStudentService {
|
|
|
isReExamine = null;
|
|
|
reExamineCompleted = null;
|
|
|
}
|
|
|
- // 考生开始重考时,将重考已完成设置为true
|
|
|
+
|
|
|
+ //考试完的最终状态
|
|
|
+ Boolean finalIsReExamine=isReExamine;
|
|
|
+ Boolean finalReExamineCompleted=reExamineCompleted;
|
|
|
+ // 考生开始重考时,将重考已完成设置为true,并重置是否重考
|
|
|
if (CommonUtil.isTrue(isReExamine)) {
|
|
|
- reExamineCompleted = true;
|
|
|
+ finalIsReExamine = false;
|
|
|
+ finalReExamineCompleted = true;
|
|
|
}
|
|
|
Date now = new Date();
|
|
|
//更新相关属性
|
|
|
examStudentRepo.updateExamStudentStartExamStatusInfo(examStudent.getId(), true,
|
|
|
- normalExamTimes, isReExamine, reExamineCompleted, now);
|
|
|
+ normalExamTimes, finalIsReExamine, finalReExamineCompleted, now);
|
|
|
examStudent.setFinished(true);
|
|
|
examStudent.setNormalExamTimes(normalExamTimes);
|
|
|
examStudent.setIsReExamine(isReExamine);
|
|
@@ -209,6 +214,4 @@ public class ExamStudentServiceImpl implements ExamStudentService {
|
|
|
examStudent.setUpdateTime(now);
|
|
|
return examStudent;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
}
|