From 198b690d16f53ff0d808cc92f585adc124b38f43 Mon Sep 17 00:00:00 2001 From: junjun Date: Tue, 26 Dec 2023 10:00:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=BF=87=E6=BB=A4?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=BF=87=E6=BB=A4=E6=97=B6=E9=97=B4=E6=88=B3?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E7=9A=84=E9=97=AE=E9=A2=98=20#7313?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/io/dataease/engine/constant/SQLConstants.java | 2 ++ .../src/main/java/io/dataease/engine/trans/ExtWhere2Str.java | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/core/core-backend/src/main/java/io/dataease/engine/constant/SQLConstants.java b/core/core-backend/src/main/java/io/dataease/engine/constant/SQLConstants.java index 57d23ee7fd..3bbd366ce4 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/constant/SQLConstants.java +++ b/core/core-backend/src/main/java/io/dataease/engine/constant/SQLConstants.java @@ -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)"; diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java b/core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java index 52ebf29b35..7d658635f5 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java @@ -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)));