|
|
@@ -267,13 +267,13 @@ public class ExamService {
|
|
|
if(null == stdAnswer.getAnswerId()) {
|
|
|
answer.setExamineeId(answerSheet.getExamineeId());
|
|
|
answer.setStudentId(SecurityUtils.getUserId());
|
|
|
- answer.setQuestionId(question.getId());
|
|
|
answer.setSeq(question.getSeq());
|
|
|
- answer.setKnowledgeId(stdAnswer.getKnowledgeId());
|
|
|
} else {
|
|
|
answer.setAnswerId(stdAnswer.getAnswerId());
|
|
|
}
|
|
|
answerList.add(answer);
|
|
|
+ answer.setQuestionId(question.getId()); // 错题计算要使用
|
|
|
+ answer.setKnowledgeId(stdAnswer.getKnowledgeId());
|
|
|
answer.setAnswer(StringUtils.join(question.getAnswers(), ","));
|
|
|
answer.setMark(null != question.getIsMark() && question.getIsMark());
|
|
|
answer.setNotKnow(null != question.getIsNotKnow() && question.getIsNotKnow());
|
|
|
@@ -354,7 +354,7 @@ public class ExamService {
|
|
|
learnExaminee.setPaperType(PaperType.Practice.getVal());
|
|
|
learnExaminee.setState(ExamineeStatus.Exam.getVal());
|
|
|
List<LearnExaminee> examineeList = examineeMapper.selectLearnExamineeList(learnExaminee);
|
|
|
- if (CollectionUtils.isNotEmpty(examineeList)) {
|
|
|
+ if (CollectionUtils.isNotEmpty(examineeList) && ExamineeStatus.Exam.getVal().equals(examineeList.get(0).getState())) {
|
|
|
LearnExaminee examinee = examineeList.get(0);
|
|
|
LearnAnswer aCond = new LearnAnswer();
|
|
|
aCond.setExamineeId(examinee.getExamineeId());
|