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

Merge pull request #10341 from dataease/pr@dev-v2@refactor_yoy

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

6
core/core-backend/src/main/java/io/dataease/chart/manage/ChartDataManage.java
View File

@ -750,7 +750,7 @@ public class ChartDataManage {
yAxis.addAll(yFields);
Quota2SQLObj.quota2sqlObj(sqlMeta, yAxis, transFields(allFields), crossDs, dsMap);
querySql = SQLProvider.createQuerySQL(sqlMeta, true, needOrder, view);
List<Long> xAxisIds = xAxis.stream().map(ChartViewFieldDTO::getId).toList();
List<Long> xAxisIds = xAxis.stream().map(ChartViewFieldDTO::getId).toList();
viewFields.addAll(xAxis);
viewFields.addAll(allFields.stream().filter(field -> !xAxisIds.contains(field.getId())).toList());
if (ObjectUtils.isNotEmpty(viewFields)) {
@ -944,12 +944,12 @@ public class ChartDataManage {
List<String[]> resultData = new ArrayList<>();
for (String[] res1 : data) {
StringBuilder x1 = new StringBuilder();
for (int i = 0; i < xAxis.size() + xAxisExt.size(); i++) {
for (int i = 0; i < xAxis.size(); i++) {
x1.append(res1[i]);
}
for (String[] res2 : yoyData) {
StringBuilder x2 = new StringBuilder();
for (int i = 0; i < xAxis.size() + xAxisExt.size(); i++) {
for (int i = 0; i < xAxis.size(); i++) {
x2.append(res2[i]);
}
if (StringUtils.equals(x1, x2)) {