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

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

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

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

@ -130,7 +130,8 @@ public class CustomWhere2Str {
}
}
// 此处获取标准格式的日期
if (StringUtils.equalsIgnoreCase(field.getType(), "date")) {
if (StringUtils.equalsIgnoreCase(field.getType(), "date")
|| (StringUtils.equalsIgnoreCase(dsMap.entrySet().iterator().next().getValue().getType(), "oracle") && StringUtils.equalsIgnoreCase(field.getType(), "timestamp"))) {
whereName = String.format(SQLConstants.DE_CAST_DATE_FORMAT, originName,
SQLConstants.DEFAULT_DATE_FORMAT,
SQLConstants.DEFAULT_DATE_FORMAT);

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

@ -143,7 +143,8 @@ public class WhereTree2Str {
originName = String.format(SQLConstants.DE_STR_TO_DATE, String.format(SQLConstants.CONCAT, "'1970-01-01 '", originName), SQLConstants.DEFAULT_DATE_FORMAT);
}
}
if (StringUtils.equalsIgnoreCase(field.getType(), "date")) {
if (StringUtils.equalsIgnoreCase(field.getType(), "date")
|| (StringUtils.equalsIgnoreCase(dsMap.entrySet().iterator().next().getValue().getType(), "oracle") && StringUtils.equalsIgnoreCase(field.getType(), "timestamp"))) {
whereName = String.format(SQLConstants.DE_CAST_DATE_FORMAT, originName,
SQLConstants.DEFAULT_DATE_FORMAT,
SQLConstants.DEFAULT_DATE_FORMAT);