center/dataease-dm
center/dataease-dm
13
0
Fork 0
forked from github/dataease
Code Pull Requests Activity

fix: pg 时间格式化错误

Browse Source
This commit is contained in:
taojinlong 2021-10-20 17:44:16 +08:00
parent 3479177374
commit a59712e6a0
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main/java/io/dataease/provider/pg/PgConstants.java
View File

@ -15,7 +15,7 @@ public class PgConstants extends SQLConstants {
public static final String UNIX_TIMESTAMP = "floor(extract(epoch from(( %s - timestamp '1970-01-01 00:00:00')*1000))) ";
public static final String DATE_FORMAT = "to_char(%s, %s)";
public static final String DATE_FORMAT = "to_char(%s, '%s')";
public static final String FROM_UNIXTIME = "to_timestamp(%s)";
@ -23,7 +23,7 @@ public class PgConstants extends SQLConstants {
public static final String CAST = "CAST(%s AS %s)";
public static final String DEFAULT_DATE_FORMAT = "'YYYY-MM-DD HH24:MI:SS'";
public static final String DEFAULT_DATE_FORMAT = "YYYY-MM-DD HH24:MI:SS";
public static final String DEFAULT_INT_FORMAT = "numeric(18,0)";

18
backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java
View File

@ -908,24 +908,24 @@ public class PgQueryProvider extends QueryProvider {
}
if (StringUtils.isEmpty(dateStyle)) {
return "'YYYY-MM-DD HH24:MI:SS'";
return "YYYY-MM-DD HH24:MI: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 "'HH24:MI:SS'";
return "HH24:MI:SS";
case "y_M_d_H_m":
return "'YYYY" + split + "MM" + split + "DD" + " HH24:MI'";
return "YYYY" + split + "MM" + split + "DD" + " HH24:MI";
case "y_M_d_H_m_s":
return "'YYYY" + split + "MM" + split + "DD" + " HH24:MI:SS'";
return "YYYY" + split + "MM" + split + "DD" + " HH24:MI:SS";
default:
return "'YYYY-MM-DD HH24:MI:SS'";
return "YYYY-MM-DD HH24:MI:SS";
}
}
@ -944,7 +944,7 @@ public class PgQueryProvider extends QueryProvider {
if (x.getDeType() == DeTypeConstants.DE_TIME) {
String format = transDateFormat(x.getDateStyle(), x.getDatePattern());
if (x.getDeExtractType() == DeTypeConstants.DE_STRING) {
fieldName = String.format(PgConstants.DATE_FORMAT, originField, format);
fieldName = String.format(PgConstants.DATE_FORMAT, String.format(PgConstants.TO_DATE, originField, "YYYY-MM-DD HH24:MI:SS"), format);
} else {
String cast = String.format(PgConstants.CAST, originField, "bigint");
String from_unixtime = String.format(PgConstants.FROM_UNIXTIME, cast);