From f81b28ea588001a1da6dbd92080446d1e85a6314 Mon Sep 17 00:00:00 2001 From: junjun Date: Thu, 12 Sep 2024 11:43:52 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=B0=9D=E8=AF=95=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=97=A5=E6=9C=9F=E8=BF=87=E6=BB=A4=E5=AD=98=E5=9C=A8=E6=97=B6?= =?UTF-8?q?=E5=8C=BA=E5=B7=AE=E5=BC=82=E7=9A=84=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/CustomWhere2Str.java | 5 ++++- .../main/java/io/dataease/engine/trans/WhereTree2Str.java | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java b/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java index 9ecd50b553..f487bd99b2 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/CustomWhere2Str.java @@ -182,8 +182,11 @@ public class CustomWhere2Str { whereValue = String.format(SQLConstants.WHERE_BETWEEN, Utils.transLong2Str(stringLongMap.get("startTime")), Utils.transLong2Str(stringLongMap.get("endTime"))); } } else { + long ts = Utils.allDateFormat2Long(value); if (isCross) { - value = Utils.allDateFormat2Long(value) + ""; + value = ts + ""; + } else { + value = Utils.transLong2Str(ts); } whereValue = String.format(SQLConstants.WHERE_VALUE_VALUE, value); } diff --git a/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java b/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java index 9964e512c3..5180dfae72 100644 --- a/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java +++ b/core/core-backend/src/main/java/io/dataease/engine/trans/WhereTree2Str.java @@ -192,8 +192,11 @@ public class WhereTree2Str { whereValue = String.format(SQLConstants.WHERE_BETWEEN, Utils.transLong2Str(stringLongMap.get("startTime")), Utils.transLong2Str(stringLongMap.get("endTime"))); } } else { + long ts = Utils.allDateFormat2Long(value); if (isCross) { - value = Utils.allDateFormat2Long(value) + ""; + value = ts + ""; + } else { + value = Utils.transLong2Str(ts); } whereValue = String.format(SQLConstants.WHERE_VALUE_VALUE, value); }