From e83b5e8ac9d0b539ae2ba5aabc20348749e49baf Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 18 Jun 2024 09:53:29 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E5=90=8C=E7=8E=AF=E6=AF=94=E6=97=A5=E6=9C=9F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=BF=87=E6=BB=A4=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/io/dataease/service/chart/ChartViewService.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java index 0527ce6280..cf4c9290e2 100644 --- a/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java +++ b/core/backend/src/main/java/io/dataease/service/chart/ChartViewService.java @@ -1151,11 +1151,11 @@ public class ChartViewService { data = datasourceProvider.getData(datasourceRequest); data = resultCustomSort(xAxis, data); + // 插件同环比 + data = pluginViewYOY(pluginViewParam, view, data); + // 请求正确的数据，然后取值 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); String yoySql = pluginViewSql(yoyPluginViewParam, view); if (StringUtils.isBlank(yoySql)) { @@ -1164,7 +1164,6 @@ public class ChartViewService { logger.info("plugin_yoy_sql:" + yoySql); datasourceRequest.setQuery(yoySql); yoyData = datasourceProvider.getData(datasourceRequest); - logger.info("less data list:" + gson.toJson(yoyData)); List resultData = new ArrayList<>(); for (String[] res1 : data) { StringBuilder x1 = new StringBuilder(); @@ -1182,7 +1181,6 @@ public class ChartViewService { } } } - logger.info("result data list:" + gson.toJson(resultData)); data.clear(); data.addAll(resultData); }