From 3b2969468479cefc46705b5b62e1f2f64b3e82b9 Mon Sep 17 00:00:00 2001 From: taojinlong Date: Mon, 26 Sep 2022 17:47:57 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20TIME=20?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=EF=BC=8C=E6=8B=BC=E6=8E=A5=E5=89=8D=E7=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataease/provider/query/mysql/MysqlQueryProvider.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java index b96fc039f1..1b3115b6f5 100644 --- a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java +++ b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java @@ -116,6 +116,8 @@ public class MysqlQueryProvider extends QueryProvider { } else { if(f.getType().equalsIgnoreCase("YEAR")){ fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + originField + ",'-01-01')", MySQLConstants.DEFAULT_DATE_FORMAT); + }else if(f.getType().equalsIgnoreCase("TIME")){ + fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(1970-01-01 " + originField + ")", MySQLConstants.DEFAULT_DATE_FORMAT); }else { fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, MySQLConstants.DEFAULT_DATE_FORMAT); } @@ -173,6 +175,8 @@ public class MysqlQueryProvider extends QueryProvider { } else { if(f.getType().equalsIgnoreCase("YEAR")){ fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + originField + ",'-01-01')", MySQLConstants.DEFAULT_DATE_FORMAT); + }else if(f.getType().equalsIgnoreCase("TIME")){ + fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(1970-01-01 " + originField + ")", MySQLConstants.DEFAULT_DATE_FORMAT); }else { fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, MySQLConstants.DEFAULT_DATE_FORMAT); } @@ -1135,6 +1139,8 @@ public class MysqlQueryProvider extends QueryProvider { } else if (x.getDeType() == 1) { if(x.getType().equalsIgnoreCase("YEAR")){ fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(" + originField + ",'-01-01')", transDateFormat(x.getDateStyle(), x.getDatePattern())); + }else if(x.getType().equalsIgnoreCase("TIME")){ + fieldName = String.format(MySQLConstants.DATE_FORMAT, "CONCAT(1970-01-01 " + originField + ")", MySQLConstants.DEFAULT_DATE_FORMAT); }else { String format = transDateFormat(x.getDateStyle(), x.getDatePattern()); fieldName = String.format(MySQLConstants.DATE_FORMAT, originField, format);