Skip to content

D
dataease
提交 08964e1b authored 作者: taojinlong's avatar taojinlong
浏览文件
操作

Merge branch 'v1.2' of github.com:dataease/dataease into v1.2

上级 6b125a65 5fc8adc4
隐藏空白字符变更
内嵌 并排
正在显示 包含 34 行增加 和 10 行删除
backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
浏览文件 @ 08964e1b
...@@ -690,7 +690,7 @@ public class DorisQueryProvider extends QueryProvider { ...@@ -690,7 +690,7 @@ public class DorisQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) {
whereName = String.format(DorisConstants.STR_TO_DATE, originName, DorisConstants.DEFAULT_DATE_FORMAT); whereName = String.format(DorisConstants.STR_TO_DATE, originName, DorisConstants.DEFAULT_DATE_FORMAT);
} }
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) { if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
String cast = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_INT_FORMAT) + "/1000"; String cast = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_INT_FORMAT) + "/1000";
whereName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT); whereName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT);
} }
...@@ -747,7 +747,7 @@ public class DorisQueryProvider extends QueryProvider { ...@@ -747,7 +747,7 @@ public class DorisQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) {
whereName = String.format(DorisConstants.STR_TO_DATE, originName, DorisConstants.DEFAULT_DATE_FORMAT); whereName = String.format(DorisConstants.STR_TO_DATE, originName, DorisConstants.DEFAULT_DATE_FORMAT);
} }
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) { if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
String cast = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_INT_FORMAT) + "/1000"; String cast = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_INT_FORMAT) + "/1000";
whereName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT); whereName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT);
} }
......
backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
浏览文件 @ 08964e1b
...@@ -675,10 +675,13 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -675,10 +675,13 @@ public class MysqlQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(MySQLConstants.STR_TO_DATE, originName, MySQLConstants.DEFAULT_DATE_FORMAT); whereName = String.format(MySQLConstants.STR_TO_DATE, originName, MySQLConstants.DEFAULT_DATE_FORMAT);
} }
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) { if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
String cast = String.format(MySQLConstants.CAST, originName, MySQLConstants.DEFAULT_INT_FORMAT) + "/1000"; String cast = String.format(MySQLConstants.CAST, originName, MySQLConstants.DEFAULT_INT_FORMAT) + "/1000";
whereName = String.format(MySQLConstants.FROM_UNIXTIME, cast, MySQLConstants.DEFAULT_DATE_FORMAT); whereName = String.format(MySQLConstants.FROM_UNIXTIME, cast, MySQLConstants.DEFAULT_DATE_FORMAT);
} }
if (field.getDeExtractType() == 1) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
...@@ -730,10 +733,13 @@ public class MysqlQueryProvider extends QueryProvider { ...@@ -730,10 +733,13 @@ public class MysqlQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(MySQLConstants.STR_TO_DATE, originName, MySQLConstants.DEFAULT_DATE_FORMAT); whereName = String.format(MySQLConstants.STR_TO_DATE, originName, MySQLConstants.DEFAULT_DATE_FORMAT);
} }
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) { if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
String cast = String.format(MySQLConstants.CAST, originName, MySQLConstants.DEFAULT_INT_FORMAT) + "/1000"; String cast = String.format(MySQLConstants.CAST, originName, MySQLConstants.DEFAULT_INT_FORMAT) + "/1000";
whereName = String.format(MySQLConstants.FROM_UNIXTIME, cast, MySQLConstants.DEFAULT_DATE_FORMAT); whereName = String.format(MySQLConstants.FROM_UNIXTIME, cast, MySQLConstants.DEFAULT_DATE_FORMAT);
} }
if (field.getDeExtractType() == 1) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
......
backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
浏览文件 @ 08964e1b
...@@ -710,10 +710,13 @@ public class OracleQueryProvider extends QueryProvider { ...@@ -710,10 +710,13 @@ public class OracleQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(OracleConstants.TO_DATE, originName, OracleConstants.DEFAULT_DATE_FORMAT); whereName = String.format(OracleConstants.TO_DATE, originName, OracleConstants.DEFAULT_DATE_FORMAT);
} }
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) { if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
String cast = String.format(OracleConstants.CAST, originName, OracleConstants.DEFAULT_INT_FORMAT) + "/1000"; String cast = String.format(OracleConstants.CAST, originName, OracleConstants.DEFAULT_INT_FORMAT) + "/1000";
whereName = String.format(OracleConstants.FROM_UNIXTIME, cast, OracleConstants.DEFAULT_DATE_FORMAT); whereName = String.format(OracleConstants.FROM_UNIXTIME, cast, OracleConstants.DEFAULT_DATE_FORMAT);
} }
if (field.getDeExtractType() == 1) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
...@@ -769,10 +772,13 @@ public class OracleQueryProvider extends QueryProvider { ...@@ -769,10 +772,13 @@ public class OracleQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(OracleConstants.TO_DATE, originName, OracleConstants.DEFAULT_DATE_FORMAT); whereName = String.format(OracleConstants.TO_DATE, originName, OracleConstants.DEFAULT_DATE_FORMAT);
} }
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) { if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
String cast = String.format(OracleConstants.CAST, originName, OracleConstants.DEFAULT_INT_FORMAT) + "/1000"; String cast = String.format(OracleConstants.CAST, originName, OracleConstants.DEFAULT_INT_FORMAT) + "/1000";
whereName = String.format(OracleConstants.FROM_UNIXTIME, cast, OracleConstants.DEFAULT_DATE_FORMAT); whereName = String.format(OracleConstants.FROM_UNIXTIME, cast, OracleConstants.DEFAULT_DATE_FORMAT);
} }
if (field.getDeExtractType() == 1) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
......
backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java
浏览文件 @ 08964e1b
...@@ -702,10 +702,13 @@ public class PgQueryProvider extends QueryProvider { ...@@ -702,10 +702,13 @@ public class PgQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(PgConstants.TO_DATE, originName, PgConstants.DEFAULT_DATE_FORMAT); whereName = String.format(PgConstants.TO_DATE, originName, PgConstants.DEFAULT_DATE_FORMAT);
} }
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) { if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
String cast = String.format(PgConstants.CAST, originName, "bigint"); String cast = String.format(PgConstants.CAST, originName, "bigint");
whereName = String.format(PgConstants.FROM_UNIXTIME, cast); whereName = String.format(PgConstants.FROM_UNIXTIME, cast);
} }
if (field.getDeExtractType() == 1) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
...@@ -757,10 +760,13 @@ public class PgQueryProvider extends QueryProvider { ...@@ -757,10 +760,13 @@ public class PgQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(PgConstants.TO_DATE, originName, PgConstants.DEFAULT_DATE_FORMAT); whereName = String.format(PgConstants.TO_DATE, originName, PgConstants.DEFAULT_DATE_FORMAT);
} }
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) { if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
String cast = String.format(PgConstants.CAST, originName, "bigint"); String cast = String.format(PgConstants.CAST, originName, "bigint");
whereName = String.format(PgConstants.FROM_UNIXTIME, cast); whereName = String.format(PgConstants.FROM_UNIXTIME, cast);
} }
if (field.getDeExtractType() == 1) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
......
backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java
浏览文件 @ 08964e1b
...@@ -657,10 +657,13 @@ public class SqlserverQueryProvider extends QueryProvider { ...@@ -657,10 +657,13 @@ public class SqlserverQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(SqlServerSQLConstants.STRING_TO_DATE, originName); whereName = String.format(SqlServerSQLConstants.STRING_TO_DATE, originName);
} }
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) { if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originName + "/1000"); String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originName + "/1000");
whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast); whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast);
} }
if (field.getDeExtractType() == 1) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
...@@ -703,10 +706,13 @@ public class SqlserverQueryProvider extends QueryProvider { ...@@ -703,10 +706,13 @@ public class SqlserverQueryProvider extends QueryProvider {
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
whereName = String.format(SqlServerSQLConstants.STRING_TO_DATE, originName); whereName = String.format(SqlServerSQLConstants.STRING_TO_DATE, originName);
} }
if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) { if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originName + "/1000"); String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originName + "/1000");
whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast); whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast);
} }
if (field.getDeExtractType() == 1) {
whereName = originName;
}
} else { } else {
whereName = originName; whereName = originName;
} }
......
Markdown 格式
0% 或
您添加了 0 人 到此讨论。请谨慎行事。
请先完成此评论的编辑！
请 注册 或者 后发表评论