From db3e3871e64a9c4f01abfb26dae3e8e0d8a58c78 Mon Sep 17 00:00:00 2001 From: junjun Date: Fri, 15 Nov 2024 16:53:59 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Ddate=E7=B1=BB=E5=9E=8B=E6=97=B6=E9=97=B4=E8=8C=83?= =?UTF-8?q?=E5=9B=B4=E4=B8=8D=E5=8C=85=E5=90=AB=E8=BE=B9=E7=95=8C=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/engine/trans/ExtWhere2Str.java | 6 +++++- .../src/main/java/io/dataease/engine/utils/Utils.java | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) 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 fa3d123eef..97e5b31153 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 @@ -212,7 +212,11 @@ public class ExtWhere2Str { whereName = String.format(SQLConstants.UNIX_TIMESTAMP, whereName); whereValue = String.format(SQLConstants.WHERE_BETWEEN, Long.parseLong(value.get(0)), Long.parseLong(value.get(1))); } else { - whereValue = String.format(SQLConstants.WHERE_BETWEEN, Utils.transLong2Str(Long.parseLong(value.get(0))), Utils.transLong2Str(Long.parseLong(value.get(1)))); + if (StringUtils.equalsIgnoreCase(request.getDatasetTableField().getType(), "date")) { + whereValue = String.format(SQLConstants.WHERE_BETWEEN, Utils.transLong2StrShort(Long.parseLong(value.get(0))), Utils.transLong2StrShort(Long.parseLong(value.get(1)))); + } else { + whereValue = String.format(SQLConstants.WHERE_BETWEEN, Utils.transLong2Str(Long.parseLong(value.get(0))), Utils.transLong2Str(Long.parseLong(value.get(1)))); + } } } } else if (request.getDatasetTableField().getDeType() == 2 diff --git a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java index b69009d51b..35ac11ecd5 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java +++ b/core/core-backend/src/main/java/io/dataease/engine/utils/Utils.java @@ -425,6 +425,12 @@ public class Utils { return simpleDateFormat.format(date); } + public static String transLong2StrShort(Long ts) { + Date date = new Date(ts); + SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd"); + return simpleDateFormat.format(date); + } + public static List getParams(List list) { if (ObjectUtils.isEmpty(list)) return Collections.emptyList(); List param = new ArrayList<>();