|
|
@@ -100,7 +100,10 @@ public class ShowPieService {
|
|
|
if ("time".equals(xColumnType)) {
|
|
|
xColumn = TimeConverterUtil.convertToOracleDateStr(xColumn, xAxisType);
|
|
|
}
|
|
|
- String fieldName = yAxisType + "(" + yColumn + ") as value,nvl(" + xColumn + ",'空') as name ";
|
|
|
+ String fieldName = yAxisType
|
|
|
+ + "(nvl(" + yColumn + ",0)) as value,"
|
|
|
+ + ("scale".equals(xColumnType) ? "nvl(" + xColumn + ",0)" : "nvl(" + xColumn + ",'空')")
|
|
|
+ + " as name ";
|
|
|
String condition = screenToColumnS + " GROUP BY " + xColumn;
|
|
|
value = showChartsMapper.getPieValueWithoutGroup(fieldName, tableName, condition);
|
|
|
xAxisData = value.stream().sorted(Comparator.comparing(PieSeriesMap::getValue)).map(PieSeriesMap::getName).collect(Collectors.toList());
|