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

Merge pull request #12918 from dataease/pr@dev-v2@fix_ds

Browse Source 
fix(数据源): 修复date类型过滤出错的问题 #12912 #12913
This commit is contained in:
Junjun 2024-10-25 17:29:51 +08:00 committed by GitHub
commit 4fb63b12fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,13 @@ public class CustomWhere2Str {
} }
} }
// 此处获取标准格式的日期 // 此处获取标准格式的日期
whereName = originName; if (StringUtils.equalsIgnoreCase(field.getType(), "date")) {
whereName = String.format(SQLConstants.DE_CAST_DATE_FORMAT, originName,
SQLConstants.DEFAULT_DATE_FORMAT,
SQLConstants.DEFAULT_DATE_FORMAT);
} else {
whereName = originName;
}
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) { } else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {

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

@ -143,7 +143,13 @@ public class WhereTree2Str {
originName = String.format(SQLConstants.DE_STR_TO_DATE, String.format(SQLConstants.CONCAT, "'1970-01-01 '", originName), SQLConstants.DEFAULT_DATE_FORMAT); originName = String.format(SQLConstants.DE_STR_TO_DATE, String.format(SQLConstants.CONCAT, "'1970-01-01 '", originName), SQLConstants.DEFAULT_DATE_FORMAT);
} }
} }
whereName = originName; if (StringUtils.equalsIgnoreCase(field.getType(), "date")) {
whereName = String.format(SQLConstants.DE_CAST_DATE_FORMAT, originName,
SQLConstants.DEFAULT_DATE_FORMAT,
SQLConstants.DEFAULT_DATE_FORMAT);
} else {
whereName = originName;
}
} }
} else if (field.getDeType() == 2 || field.getDeType() == 3) { } else if (field.getDeType() == 2 || field.getDeType() == 3) {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {