|
|
@@ -63,6 +63,7 @@ public class ShowPieService {
|
|
|
yAxisType = CalculationJudgeUtil.Judge(yType),
|
|
|
sort = StringUtils.isEmpty(pieConfigInfo.getSort()) ? xColumn : pieConfigInfo.getSort(),
|
|
|
rule = StringUtils.isEmpty(pieConfigInfo.getRule()) ? "ASC" : pieConfigInfo.getRule();
|
|
|
+ boolean hiddenOther = pieConfigInfo.isHiddenOther();
|
|
|
List<String> groupBy = pieConfigInfo.getGroups(), //分组
|
|
|
xAxisData = new ArrayList<String>(); //X轴自己用
|
|
|
PieSeries series = new PieSeries();
|
|
|
@@ -151,7 +152,7 @@ public class ShowPieService {
|
|
|
chartsDataInfo.setTooMany(true);
|
|
|
value = new ArrayList<>(value.stream().collect(Collectors.toList()).subList(0, pieConfigInfo.getMaxCount()));
|
|
|
Optional<Double> part = value.stream().map(PieSeriesMap::getValue).reduce(Double::sum);
|
|
|
- if (total.isPresent() && part.isPresent()) {
|
|
|
+ if (total.isPresent() && part.isPresent() && hiddenOther==false) {
|
|
|
value.add(new PieSeriesMap(total.get() - part.get(), "其它"));
|
|
|
}
|
|
|
}
|