|
@@ -142,11 +142,15 @@ public class SelectiveGroupServiceImpl extends BaseQueryService<SelectiveGroup>
|
|
|
|
|
|
@Override
|
|
|
public double sumScoreByExamIdAndSubjectCode(int examId, String subjectCode) {
|
|
|
- List<ExamQuestion> questionList = questionService.findMainByExamAndSubjectAndObjective(examId, subjectCode,
|
|
|
- false);
|
|
|
+ List<ExamQuestion> questionList = questionService.findByExamAndSubjectAndObjective(examId, subjectCode, false);
|
|
|
Map<Integer, Double> mainScoreMap = new HashMap<Integer, Double>();
|
|
|
for (ExamQuestion question : questionList) {
|
|
|
- mainScoreMap.put(question.getMainNumber(), question.getTotalScore());
|
|
|
+ Double mainScore = mainScoreMap.get(question.getMainNumber());
|
|
|
+ if (mainScore == null) {
|
|
|
+ mainScoreMap.put(question.getMainNumber(), question.getTotalScore());
|
|
|
+ } else {
|
|
|
+ mainScoreMap.put(question.getMainNumber(), BigDecimalUtils.add(mainScore, question.getTotalScore()));
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
Map<Integer, List<SelectiveGroup>> indexMap = this.findGroupByExamIdAndSubjectCode(examId, subjectCode);
|