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

fix: 修复过滤组件过滤时间戳不显示的问题 #7313

Browse Source
This commit is contained in:
junjun 2023-12-26 10:00:30 +08:00
parent e8a0ebd538
commit 198b690d16
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/core-backend/src/main/java/io/dataease/engine/constant/SQLConstants.java
View File

@ -87,6 +87,8 @@ public class SQLConstants {
public static final String WHERE_BETWEEN = "'%s' AND '%s'";
public static final String WHERE_CALUE_BETWEEN = "%s AND %s";
public static final String BRACKETS = "(%s)";
public static final String ROUND = "ROUND(%s,%s)";

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

@ -107,7 +107,7 @@ public class ExtWhere2Str {
if (request.getDatasetTableField().getDeExtractType() == 2
|| request.getDatasetTableField().getDeExtractType() == 3
|| request.getDatasetTableField().getDeExtractType() == 4) {
whereValue = String.format(SQLConstants.WHERE_BETWEEN, value.get(0), value.get(1));
whereValue = String.format(SQLConstants.WHERE_CALUE_BETWEEN, value.get(0), value.get(1));
} else {
whereName = String.format(SQLConstants.UNIX_TIMESTAMP, whereName);
whereValue = String.format(SQLConstants.WHERE_BETWEEN, Long.parseLong(value.get(0)), Long.parseLong(value.get(1)));