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

Merge pull request #10340 from dataease/pr@dev@test_yoy

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

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

@ -1167,12 +1167,12 @@ public class ChartViewService {
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)) {
@ -1742,15 +1742,14 @@ public class ChartViewService {
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]);
}
logger.info("data compare:" + x1 + "---" + x2 + "-----" + StringUtils.equals(x1, x2));
if (StringUtils.equals(x1, x2)) {
resultData.add(res1);
break;