|
@@ -273,13 +273,8 @@ public class UpdateQuestionScoreService {
|
|
|
if (!StringUtils.isNullOrEmpty(rightAnswer)) {
|
|
|
ExamQuestionEntity curQues = questionUnitList.get(i);
|
|
|
|
|
|
- String curCorrectAnswer = curQues.getCorrectAnswer();
|
|
|
-
|
|
|
- if (StringUtils.isNullOrEmpty(curCorrectAnswer)
|
|
|
- || (!StringUtils.isNullOrEmpty(curCorrectAnswer) && !curCorrectAnswer.equals(rightAnswer))) {
|
|
|
- updatePartialQuestionAnswer(examRecordQuestionsId, curQues.getOrder(),
|
|
|
- rightAnswer, calcStudentUnitScore(rightAnswer, curQues.getStudentAnswer(), questionScore));
|
|
|
- }
|
|
|
+ updatePartialQuestionAnswer(examRecordQuestionsId, curQues.getOrder(),
|
|
|
+ rightAnswer, calcStudentUnitScore(rightAnswer, curQues.getStudentAnswer(), questionScore));
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -303,9 +298,6 @@ public class UpdateQuestionScoreService {
|
|
|
continue;//垃圾数据
|
|
|
}
|
|
|
|
|
|
- //题库中的原始试卷结构
|
|
|
- DefaultPaperBean originalPaper = getPaper(examId, courseCode, record.getPaperType(), record.getBasePaperId());
|
|
|
-
|
|
|
DefaultPaperBean defaultPaper = paperStructBean.getDefaultPaper();
|
|
|
|
|
|
//题组
|
|
@@ -622,10 +614,10 @@ public class UpdateQuestionScoreService {
|
|
|
update.set("examQuestionEntities.$.questionScore", newQuestionScore);
|
|
|
|
|
|
UpdateResult upResult = mongoTemplate.updateFirst(query, update, "examRecordQuestions");
|
|
|
- long res =upResult.getMatchedCount();
|
|
|
+ long res = upResult.getMatchedCount();
|
|
|
|
|
|
System.out.println(String.format("更新作答记录中小题分数成功effectNum=%s,id=%s,order=%s,newQuestionScore=%s",
|
|
|
- res,examRecordQuestionsId, order, newQuestionScore));
|
|
|
+ res, examRecordQuestionsId, order, newQuestionScore));
|
|
|
return res;
|
|
|
}
|
|
|
|
|
@@ -647,10 +639,10 @@ public class UpdateQuestionScoreService {
|
|
|
update.set("examQuestionEntities.$.studentScore", studentScore);
|
|
|
|
|
|
UpdateResult upResult = mongoTemplate.updateFirst(query, update, "examRecordQuestions");
|
|
|
- long res =upResult.getMatchedCount();
|
|
|
+ long res = upResult.getMatchedCount();
|
|
|
|
|
|
System.out.println(String.format("更新作答记录中学生分数成功effectNum=%s,id=%s,order=%s,studentScore=%s,correctAnswer=%s",
|
|
|
- res,examRecordQuestionsId, order, studentScore,newAnswer));
|
|
|
+ res, examRecordQuestionsId, order, studentScore, newAnswer));
|
|
|
return res;
|
|
|
}
|
|
|
|