dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10326 from dataease/pr@dev@refactor_yoy

Browse Source 
refactor(视图): 优化同环比日期字段过滤逻辑
This commit is contained in:
Junjun 2024-06-17 18:16:51 +08:00 committed by GitHub
commit 090ed2d682
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1155,6 +1155,7 @@ public class ChartViewService {
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)) {
@ -1163,6 +1164,7 @@ 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<String[]> resultData = new ArrayList<>();
for (String[] res1 : data) {
StringBuilder x1 = new StringBuilder();