|
|
@@ -471,15 +471,16 @@ public class ExamService {
|
|
|
return answerSheet;
|
|
|
}
|
|
|
private AnswerSheet openExamineeByPaper(Long paperId) {
|
|
|
+ LearnPaper learnPaper = paperMapper.selectLearnPaperById(paperId);
|
|
|
+
|
|
|
LearnExaminee examinee = new LearnExaminee();
|
|
|
examinee.setStudentId(SecurityUtils.getLoginUser().getUser().getUserId());
|
|
|
examinee.setPaperType(PaperType.Simulated.getVal());
|
|
|
- examinee.setPaperKey("P" + "_" + paperId);
|
|
|
+ examinee.setPaperKey("P" + "_" + paperId + "_" + learnPaper.getSubjectId());
|
|
|
examinee.setState(ExamineeStatus.Sign.getVal());
|
|
|
List<LearnExaminee> examineeList = examineeMapper.selectLearnExamineeList(examinee);
|
|
|
- LearnPaper learnPaper = paperMapper.selectLearnPaperById(paperId);
|
|
|
if(CollectionUtils.isNotEmpty(examineeList)) {
|
|
|
- return buildAnswerSheet(learnPaper, examineeList.get(0), loadQuestionAnswers(examinee, true));
|
|
|
+ return buildAnswerSheet(learnPaper, examineeList.get(0), loadQuestionAnswers(examineeList.get(0), true));
|
|
|
}
|
|
|
return openNewExamineeByPaper(examinee, learnPaper);
|
|
|
}
|