|
|
@@ -457,7 +457,7 @@ public class ExamService {
|
|
|
LearnAnswer aCond = new LearnAnswer();
|
|
|
aCond.setExamineeId(examinee.getExamineeId());
|
|
|
Map<Long, LearnAnswer> answerMap = learnAnswerMapper.selectLearnAnswerList(aCond).stream().collect(Collectors.toMap(LearnAnswer::getQuestionId, t -> t));
|
|
|
- List<PaperVO.QuestionAnswer> questionList = paperService.loadPaperQuestionAnswers(SecurityUtils.getUserId(), examinee.getPaperId(), answerMap, false);
|
|
|
+ List<PaperVO.QuestionAnswer> questionList = paperService.loadPaperQuestionAnswers(SecurityUtils.getUserId(), examinee.getPaperId(), answerMap, true);
|
|
|
AnswerSheet answerSheet = buildAnswerSheet(existPaper, examinee);
|
|
|
answerSheet.setQuestions(questionList);
|
|
|
answerSheet.setKnowledgeId(existPaper.getRelateId());
|
|
|
@@ -506,6 +506,8 @@ public class ExamService {
|
|
|
examineeMapper.insertLearnExaminee(learnExaminee);
|
|
|
|
|
|
AnswerSheet answerSheet = buildAnswerSheet(paper, learnExaminee);
|
|
|
+ List<PaperVO.QuestionAnswer> questionList = paperService.loadPaperQuestionAnswers(SecurityUtils.getUserId(), paper.getId(), null, true);
|
|
|
+ answerSheet.setQuestions(questionList);
|
|
|
answerSheet.setKnowledgeId(paper.getRelateId());
|
|
|
return answerSheet;
|
|
|
}
|