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

fix: 时间过滤

Browse Source
This commit is contained in:
junjun 2023-09-06 14:47:03 +08:00
parent fd6599896e
commit 92f25e94fd
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
View File

@ -1077,8 +1077,8 @@ public class DorisQueryProvider extends QueryProvider {
String format = transDateFormat(request.getDateStyle(), request.getDatePattern()); String format = transDateFormat(request.getDateStyle(), request.getDatePattern());
if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) { if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) {
String date = String.format(MySQLConstants.STR_TO_DATE, originName, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : MysqlConstants.DEFAULT_DATE_FORMAT); String date = String.format(MySQLConstants.STR_TO_DATE, originName, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : MysqlConstants.DEFAULT_DATE_FORMAT);
if (request.getOperator().equals("between")) { if (request.getOperator().equals("between") && request.getDatasetTableField().getDeExtractType() != 1) {
whereName = date; whereName = String.format(MySQLConstants.UNIX_TIMESTAMP, date) + "*1000";
} else { } else {
whereName = String.format(MySQLConstants.DATE_FORMAT, date, format); whereName = String.format(MySQLConstants.DATE_FORMAT, date, format);
} }
@ -1126,10 +1126,14 @@ public class DorisQueryProvider extends QueryProvider {
whereName = "upper(" + whereName + ")"; whereName = "upper(" + whereName + ")";
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) { } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
if (request.getDatasetTableField().getDeType() == 1) { if (request.getDatasetTableField().getDeType() == 1) {
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS"); if (request.getDatasetTableField().getDeExtractType() == 1) {
String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0)))); SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1)))); String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
whereValue = String.format(DorisConstants.WHERE_BETWEEN, startTime, endTime); String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
whereValue = String.format(DorisConstants.WHERE_BETWEEN, startTime, endTime);
} else {
whereValue = String.format(MysqlConstants.WHERE_BETWEEN, value.get(0), value.get(1));
}
} else { } else {
whereValue = String.format(DorisConstants.WHERE_BETWEEN, value.get(0), value.get(1)); whereValue = String.format(DorisConstants.WHERE_BETWEEN, value.get(0), value.get(1));
} }