From d3e2756b26f5d7d94046193bdcc5ed0c7de2aab3 Mon Sep 17 00:00:00 2001 From: junjie Date: Sat, 18 Sep 2021 10:39:50 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=97=A5=E6=9C=9F=E4=B8=8B=E9=92=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/io/dataease/provider/ch/CHQueryProvider.java | 6 ++++++ .../io/dataease/provider/doris/DorisQueryProvider.java | 6 ++++++ .../main/java/io/dataease/provider/es/EsQueryProvider.java | 6 ++++++ .../io/dataease/provider/mysql/MysqlQueryProvider.java | 6 ++++++ .../io/dataease/provider/oracle/OracleQueryProvider.java | 6 ++++++ .../main/java/io/dataease/provider/pg/PgQueryProvider.java | 6 ++++++ .../provider/sqlserver/SqlserverQueryProvider.java | 7 +++++++ 7 files changed, 43 insertions(+) diff --git a/backend/src/main/java/io/dataease/provider/ch/CHQueryProvider.java b/backend/src/main/java/io/dataease/provider/ch/CHQueryProvider.java index fd34f5ebc6..6e824b9830 100644 --- a/backend/src/main/java/io/dataease/provider/ch/CHQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/ch/CHQueryProvider.java @@ -872,6 +872,12 @@ public class CHQueryProvider extends QueryProvider { split = "-"; } else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) { split = "/"; + } else { + split = "-"; + } + + if (StringUtils.isEmpty(dateStyle)) { + return "%Y-%m-%d %H:%M:%S"; } switch (dateStyle) { diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java index a45b00a682..4e2edef89b 100644 --- a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java @@ -865,6 +865,12 @@ public class DorisQueryProvider extends QueryProvider { split = "-"; } else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) { split = "/"; + } else { + split = "-"; + } + + if (StringUtils.isEmpty(dateStyle)) { + return "%Y-%m-%d %H:%i:%S"; } switch (dateStyle) { diff --git a/backend/src/main/java/io/dataease/provider/es/EsQueryProvider.java b/backend/src/main/java/io/dataease/provider/es/EsQueryProvider.java index dd8b7062da..9f8924c6eb 100644 --- a/backend/src/main/java/io/dataease/provider/es/EsQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/es/EsQueryProvider.java @@ -816,6 +816,12 @@ public class EsQueryProvider extends QueryProvider { split = "-"; } else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) { split = "/"; + } else { + split = "-"; + } + + if (StringUtils.isEmpty(dateStyle)) { + return "YYYY-MM-dd HH:mm:ss"; } switch (dateStyle) { diff --git a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java index 792e37a004..3e1e8448c8 100644 --- a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java @@ -859,6 +859,12 @@ public class MysqlQueryProvider extends QueryProvider { split = "-"; } else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) { split = "/"; + } else { + split = "-"; + } + + if (StringUtils.isEmpty(dateStyle)) { + return "%Y-%m-%d %H:%i:%S"; } switch (dateStyle) { diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java index 6eda02c29a..a37910e01e 100644 --- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java @@ -899,6 +899,12 @@ public class OracleQueryProvider extends QueryProvider { split = "-"; } else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) { split = "/"; + } else { + split = "-"; + } + + if (StringUtils.isEmpty(dateStyle)) { + return OracleConstants.DEFAULT_DATE_FORMAT; } switch (dateStyle) { diff --git a/backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java b/backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java index d53b88f60e..67c89758b9 100644 --- a/backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java @@ -886,6 +886,12 @@ public class PgQueryProvider extends QueryProvider { split = "-"; } else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) { split = "/"; + } else { + split = "-"; + } + + if (StringUtils.isEmpty(dateStyle)) { + return "'YYYY-MM-DD HH24:MI:SS'"; } switch (dateStyle) { diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java index a5c115af2b..3fcb7b5824 100644 --- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java @@ -13,6 +13,7 @@ import io.dataease.dto.chart.ChartViewFieldDTO; import io.dataease.dto.sqlObj.SQLObj; import io.dataease.provider.QueryProvider; import io.dataease.provider.SQLConstants; +import io.dataease.provider.oracle.OracleConstants; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; @@ -825,6 +826,12 @@ public class SqlserverQueryProvider extends QueryProvider { split = "-"; } else if (StringUtils.equalsIgnoreCase(datePattern, "date_split")) { split = "/"; + } else { + split = "-"; + } + + if (StringUtils.isEmpty(dateStyle)) { + return "convert(varchar," + originField + ",120)"; } switch (dateStyle) {