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

Merge pull request #9156 from dataease/pr@dev-v2@fix_filter

Browse Source 
fix: 修复日期过滤逻辑错误
This commit is contained in:
Junjun 2024-04-17 11:53:16 +08:00 committed by GitHub
commit 5c7e0511aa
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java
View File

@ -113,12 +113,12 @@ public class CustomWhere2Str {
} else { } else {
// 如果是时间字段过滤，当条件是等于和不等于的时候转换成between和not between // 如果是时间字段过滤，当条件是等于和不等于的时候转换成between和not between
if (field.getDeType() == 1) { if (field.getDeType() == 1) {
if (StringUtils.containsIgnoreCase(whereTerm, "=")) { if (StringUtils.equalsIgnoreCase(whereTerm, " = ")) {
whereTerm = " BETWEEN "; whereTerm = " BETWEEN ";
// 把value类似过滤组件处理，获得start time和end time // 把value类似过滤组件处理，获得start time和end time
Map<String, Long> stringLongMap = Utils.parseDateTimeValue(value); Map<String, Long> stringLongMap = Utils.parseDateTimeValue(value);
whereValue = String.format(SQLConstants.WHERE_VALUE_BETWEEN, stringLongMap.get("startTime"), stringLongMap.get("endTime")); whereValue = String.format(SQLConstants.WHERE_VALUE_BETWEEN, stringLongMap.get("startTime"), stringLongMap.get("endTime"));
} else if (StringUtils.containsIgnoreCase(whereTerm, "<>")) { } else if (StringUtils.equalsIgnoreCase(whereTerm, " <> ")) {
whereTerm = " NOT BETWEEN "; whereTerm = " NOT BETWEEN ";
Map<String, Long> stringLongMap = Utils.parseDateTimeValue(value); Map<String, Long> stringLongMap = Utils.parseDateTimeValue(value);
whereValue = String.format(SQLConstants.WHERE_VALUE_BETWEEN, stringLongMap.get("startTime"), stringLongMap.get("endTime")); whereValue = String.format(SQLConstants.WHERE_VALUE_BETWEEN, stringLongMap.get("startTime"), stringLongMap.get("endTime"));

4
core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java
View File

@ -149,12 +149,12 @@ public class WhereTree2Str {
} else { } else {
// 如果是时间字段过滤，当条件是等于和不等于的时候转换成between和not between // 如果是时间字段过滤，当条件是等于和不等于的时候转换成between和not between
if (field.getDeType() == 1) { if (field.getDeType() == 1) {
if (StringUtils.containsIgnoreCase(whereTerm, "=")) { if (StringUtils.equalsIgnoreCase(whereTerm, " = ")) {
whereTerm = " BETWEEN "; whereTerm = " BETWEEN ";
// 把value类似过滤组件处理，获得start time和end time // 把value类似过滤组件处理，获得start time和end time
Map<String, Long> stringLongMap = Utils.parseDateTimeValue(value); Map<String, Long> stringLongMap = Utils.parseDateTimeValue(value);
whereValue = String.format(SQLConstants.WHERE_VALUE_BETWEEN, stringLongMap.get("startTime"), stringLongMap.get("endTime")); whereValue = String.format(SQLConstants.WHERE_VALUE_BETWEEN, stringLongMap.get("startTime"), stringLongMap.get("endTime"));
} else if (StringUtils.containsIgnoreCase(whereTerm, "<>")) { } else if (StringUtils.equalsIgnoreCase(whereTerm, " <> ")) {
whereTerm = " NOT BETWEEN "; whereTerm = " NOT BETWEEN ";
Map<String, Long> stringLongMap = Utils.parseDateTimeValue(value); Map<String, Long> stringLongMap = Utils.parseDateTimeValue(value);
whereValue = String.format(SQLConstants.WHERE_VALUE_BETWEEN, stringLongMap.get("startTime"), stringLongMap.get("endTime")); whereValue = String.format(SQLConstants.WHERE_VALUE_BETWEEN, stringLongMap.get("startTime"), stringLongMap.get("endTime"));