From 2a62c3567374796007c7ee75494be75447e521e2 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Sun, 30 Jan 2022 00:11:30 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20es=20=E6=97=B6=E9=97=B4=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../provider/query/es/EsQueryProvider.java | 14 +++++++------- .../provider/query/es/EsSqlLConstants.java | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java index 49670f34bc..77f24131ab 100644 --- a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java @@ -942,24 +942,24 @@ public class EsQueryProvider extends QueryProvider { } if (StringUtils.isEmpty(dateStyle)) { - return "YYYY-MM-dd HH:mm:ss"; + return "yyyy-MM-dd HH:mm:ss"; } switch (dateStyle) { case "y": - return "YYYY"; + return "yyyy"; case "y_M": - return "YYYY" + split + "MM"; + return "yyyy" + split + "MM"; case "y_M_d": - return "YYYY" + split + "MM" + split + "dd"; + return "yyyy" + split + "MM" + split + "dd"; case "H_m_s": return "HH:mm:ss"; case "y_M_d_H_m": - return "YYYY" + split + "MM" + split + "dd" + " HH:mm"; + return "yyyy" + split + "MM" + split + "dd" + " HH:mm"; case "y_M_d_H_m_s": - return "YYYY" + split + "MM" + split + "dd" + " HH:mm:ss"; + return "yyyy" + split + "MM" + split + "dd" + " HH:mm:ss"; default: - return "YYYY-MM-dd HH:mm:ss"; + return "yyyy-MM-dd HH:mm:ss"; } } diff --git a/backend/src/main/java/io/dataease/provider/query/es/EsSqlLConstants.java b/backend/src/main/java/io/dataease/provider/query/es/EsSqlLConstants.java index 3dab2d8e56..62301f3bf6 100644 --- a/backend/src/main/java/io/dataease/provider/query/es/EsSqlLConstants.java +++ b/backend/src/main/java/io/dataease/provider/query/es/EsSqlLConstants.java @@ -21,7 +21,7 @@ public class EsSqlLConstants extends SQLConstants { public static final String ROUND = "ROUND(%s, %s)"; - public static final String DEFAULT_DATE_FORMAT = "YYYY-MM-dd HH:mm:ss"; + public static final String DEFAULT_DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; public static final String WHERE_VALUE_NULL = "(NULL,'')";