|
|
@@ -54,6 +54,7 @@ public class ShowIndicatorService {
|
|
|
String condition = getCondition(filters, indicatorConfigInfo.getxField().getColumnRename(), indicatorConfigInfo.getyField().getColumnRename());
|
|
|
String tableName = chartsUtilService.getSqlStr(token, indicatorConfigInfo.getId(), 0);
|
|
|
String operate = CalculationJudgeUtil.Judge(indicatorConfigInfo.getyField().getShowDataType());
|
|
|
+ chartsDataInfo.setChartsColumnConfig(chartsConfigMapper.getChartsColumn(indicatorConfigInfo.getId()));
|
|
|
if (ObjectUtils.isEmpty(indicatorConfigInfo.getxField())) {
|
|
|
fields += operate.contains("distinct") ? " count(" + indicatorConfigInfo.getyField().getColumnRename() + ") as \"value\" " : operate + "(" + indicatorConfigInfo.getyField().getColumnRename() + ") as \"value\" ";
|
|
|
}else {
|
|
|
@@ -78,7 +79,6 @@ public class ShowIndicatorService {
|
|
|
DynamicDataSourceContextHolder.setDataSourceType(baseId);
|
|
|
}
|
|
|
List<Map<String, Object>> indicatorSeriesMapList = showChartsMapper.getIndicatorValue(fields, tableName, condition, sort, indicatorConfigInfo.getRule(), indicatorConfigInfo.getThreshold());
|
|
|
- chartsDataInfo.setChartsColumnConfig(chartsConfigMapper.getChartsColumn(indicatorConfigInfo.getId()));
|
|
|
chartsDataInfo.setSerieses(indicatorSeriesMapList);
|
|
|
chartsDataInfo.setStyleConfig(styleConfig);
|
|
|
} catch (Exception e) {
|