center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

refactor(视图): 优化同环比日期字段过滤逻辑

Browse Source
This commit is contained in:
junjun 2024-06-18 09:53:29 +08:00
parent 35a6f701fd
commit e83b5e8ac9
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
View File

@ -1151,11 +1151,11 @@ public class ChartViewService {
data = datasourceProvider.getData(datasourceRequest); data = datasourceProvider.getData(datasourceRequest);
data = resultCustomSort(xAxis, data); data = resultCustomSort(xAxis, data);
// 插件同环比
data = pluginViewYOY(pluginViewParam, view, data);
// 请求正确的数据，然后取值 // 请求正确的数据，然后取值
if (isYOY) { if (isYOY) {
// 如果有同环比，先走插件同环比计算逻辑
data = pluginViewYOY(pluginViewParam, view, data);
logger.info("more data list:" + gson.toJson(data));
PluginViewParam yoyPluginViewParam = buildPluginParam(fieldMap, fieldCustomFilter, yoyFilterList, ds, table, view, rowPermissionsTree, chartExtRequest); PluginViewParam yoyPluginViewParam = buildPluginParam(fieldMap, fieldCustomFilter, yoyFilterList, ds, table, view, rowPermissionsTree, chartExtRequest);
String yoySql = pluginViewSql(yoyPluginViewParam, view); String yoySql = pluginViewSql(yoyPluginViewParam, view);
if (StringUtils.isBlank(yoySql)) { if (StringUtils.isBlank(yoySql)) {
@ -1164,7 +1164,6 @@ public class ChartViewService {
logger.info("plugin_yoy_sql:" + yoySql); logger.info("plugin_yoy_sql:" + yoySql);
datasourceRequest.setQuery(yoySql); datasourceRequest.setQuery(yoySql);
yoyData = datasourceProvider.getData(datasourceRequest); yoyData = datasourceProvider.getData(datasourceRequest);
logger.info("less data list:" + gson.toJson(yoyData));
List<String[]> resultData = new ArrayList<>(); List<String[]> resultData = new ArrayList<>();
for (String[] res1 : data) { for (String[] res1 : data) {
StringBuilder x1 = new StringBuilder(); StringBuilder x1 = new StringBuilder();
@ -1182,7 +1181,6 @@ public class ChartViewService {
} }
} }
} }
logger.info("result data list:" + gson.toJson(resultData));
data.clear(); data.clear();
data.addAll(resultData); data.addAll(resultData);
} }