|
@@ -913,7 +913,9 @@ public class MarkServiceImpl implements MarkService {
|
|
List<SubjectiveScore> mainScoreList = mainScoreMap.get(mainNumber);
|
|
List<SubjectiveScore> mainScoreList = mainScoreMap.get(mainNumber);
|
|
double mainScore = 0.0;
|
|
double mainScore = 0.0;
|
|
for (SubjectiveScore subjectiveScore : mainScoreList) {
|
|
for (SubjectiveScore subjectiveScore : mainScoreList) {
|
|
- mainScore = BigDecimalUtils.add(mainScore, subjectiveScore.getScore());
|
|
|
|
|
|
+ if (subjectiveScore.getScore() != UN_SELECTIVE_SCORE) {
|
|
|
|
+ mainScore = BigDecimalUtils.add(mainScore, subjectiveScore.getScore());
|
|
|
|
+ }
|
|
}
|
|
}
|
|
for (SubjectiveScore subjectiveScore : mainScoreList) {
|
|
for (SubjectiveScore subjectiveScore : mainScoreList) {
|
|
subjectiveScore.setMainScore(mainScore);
|
|
subjectiveScore.setMainScore(mainScore);
|