public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-15 05:22:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12767 from dataease/pr@dev-v2@fix_panel

Browse Source 
fix(仪表板): 修复过滤组件过滤时间范围异常的问题
This commit is contained in:
Junjun
2024-10-18 11:37:26 +08:00
committed by GitHub
parent edd3266b5a c7cc659eb7
commit a66813f753
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java
View File

@@ -13,7 +13,10 @@ import io.dataease.extensions.view.dto.ChartExtFilterDTO;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -100,8 +103,10 @@ public class ExtWhere2Str {
originName = String.format(SQLConstants.DE_STR_TO_DATE, String.format(SQLConstants.CONCAT, "'1970-01-01 '", originName), SQLConstants.DEFAULT_DATE_FORMAT);
}
}
// 此处获取标准格式的日期
whereName = originName;
// 此处获取标准格式的日期，同时此处是仪表板过滤，仪表板中图表的日期均已经格式化，所以要强制加上日期转换
whereName = String.format(SQLConstants.DE_CAST_DATE_FORMAT, originName,
SQLConstants.DEFAULT_DATE_FORMAT,
SQLConstants.DEFAULT_DATE_FORMAT);
}
} else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {