|
@@ -1256,11 +1256,11 @@ public class MarkServiceImpl implements MarkService {
|
|
doubleList.remove(2);
|
|
doubleList.remove(2);
|
|
}
|
|
}
|
|
double sum = doubleList.stream().collect(Collectors.summingDouble(x -> x));
|
|
double sum = doubleList.stream().collect(Collectors.summingDouble(x -> x));
|
|
- item.setScore(BigDecimalUtils.div(sum, list.size()));
|
|
|
|
|
|
+ item.setScore(BigDecimalUtils.div(sum, doubleList.size()));
|
|
score = BigDecimalUtils.add(score, item.getScore());
|
|
score = BigDecimalUtils.add(score, item.getScore());
|
|
} else if (ScorePolicy.AVG.equals(group.getScorePolicy())) {
|
|
} else if (ScorePolicy.AVG.equals(group.getScorePolicy())) {
|
|
double sum = doubleList.stream().collect(Collectors.summingDouble(x -> x));
|
|
double sum = doubleList.stream().collect(Collectors.summingDouble(x -> x));
|
|
- item.setScore(BigDecimalUtils.div(sum, list.size()));
|
|
|
|
|
|
+ item.setScore(BigDecimalUtils.div(sum, doubleList.size()));
|
|
score = BigDecimalUtils.add(score, item.getScore());
|
|
score = BigDecimalUtils.add(score, item.getScore());
|
|
} else if (ScorePolicy.MAX.equals(group.getScorePolicy())) {
|
|
} else if (ScorePolicy.MAX.equals(group.getScorePolicy())) {
|
|
double max = doubleList.stream().reduce(doubleList.get(0), Double::max);
|
|
double max = doubleList.stream().reduce(doubleList.get(0), Double::max);
|