public/dataease
1
0
Fork 0
mirror of https://github.com/dataease/dataease.git synced 2026-05-19 10:18:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(数据集): TIME 类型，拼接前缀

Browse Source
This commit is contained in:
taojinlong
2022-09-26 17:47:57 +08:00
parent 87d7b56a8e
commit 3b29694684
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
View File

@@ -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);