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

Merge pull request #763 from dataease/pr@dev@fix_ds_filter

Browse Source 
fix: 过滤时间类型字段可能出错
This commit is contained in:
XiaJunjie2020 2021-09-03 16:37:45 +08:00 committed by GitHub
commit 176742748d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -679,6 +679,9 @@ public class MysqlQueryProvider extends QueryProvider {
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;
} }
@ -734,6 +737,9 @@ public class MysqlQueryProvider extends QueryProvider {
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;
} }

6
backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
View File

@ -714,6 +714,9 @@ public class OracleQueryProvider extends QueryProvider {
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;
} }
@ -773,6 +776,9 @@ public class OracleQueryProvider extends QueryProvider {
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;
} }

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

@ -706,6 +706,9 @@ public class PgQueryProvider extends QueryProvider {
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;
} }
@ -761,6 +764,9 @@ public class PgQueryProvider extends QueryProvider {
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;
} }

6
backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java
View File

@ -661,6 +661,9 @@ public class SqlserverQueryProvider extends QueryProvider {
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;
} }
@ -707,6 +710,9 @@ public class SqlserverQueryProvider extends QueryProvider {
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;
} }