dongjunchuan/de
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: ck 时间过滤

Browse Source
This commit is contained in:
taojinlong 2021-09-26 17:54:57 +08:00
parent 236c761677
commit ae90ed3ab9
2 changed files with 60 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

73
backend/src/main/java/io/dataease/provider/ck/CKQueryProvider.java
View File

@ -803,12 +803,29 @@ public class CKQueryProvider extends QueryProvider {
} else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
whereValue = "'%" + value + "%'";
} else {
whereValue = String.format(CKConstants.WHERE_VALUE_VALUE, value);
if(field.getDeType() == DeTypeConstants.DE_TIME){
whereValue = String.format(CKConstants.toDateTime, "'" + value + "'");
}else {
whereValue = String.format(CKConstants.WHERE_VALUE_VALUE, value);
}
}
list.add(SQLObj.builder()
.whereField(whereName)
.whereTermAndValue(whereTerm + whereValue)
.build());
if(field.getDeType() == DeTypeConstants.DE_TIME && StringUtils.equalsIgnoreCase(request.getTerm(), "null")){
list.add(SQLObj.builder()
.whereField(whereName)
.whereTermAndValue("is null")
.build());
}else if(field.getDeType() == DeTypeConstants.DE_TIME && StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")){
list.add(SQLObj.builder()
.whereField(whereName)
.whereTermAndValue("is not null")
.build());
}else {
list.add(SQLObj.builder()
.whereField(whereName)
.whereTermAndValue(whereTerm + whereValue)
.build());
}
}
return list;
}
@ -870,10 +887,23 @@ public class CKQueryProvider extends QueryProvider {
} else {
whereValue = String.format(CKConstants.WHERE_VALUE_VALUE, value.get(0));
}
list.add(SQLObj.builder()
.whereField(whereName)
.whereTermAndValue(whereTerm + whereValue)
.build());
if(field.getDeType() == DeTypeConstants.DE_TIME && StringUtils.equalsIgnoreCase(request.getOperator(), "null")){
list.add(SQLObj.builder()
.whereField(whereName)
.whereTermAndValue("is null")
.build());
}else if(field.getDeType() == DeTypeConstants.DE_TIME && StringUtils.equalsIgnoreCase(request.getOperator(), "not_null")){
list.add(SQLObj.builder()
.whereField(whereName)
.whereTermAndValue("is not null")
.build());
}else {
list.add(SQLObj.builder()
.whereField(whereName)
.whereTermAndValue(whereTerm + whereValue)
.build());
}
}
return list;
}
@ -991,11 +1021,26 @@ public class CKQueryProvider extends QueryProvider {
} else {
whereValue = String.format(CKConstants.WHERE_VALUE_VALUE, f.getValue());
}
list.add(SQLObj.builder()
.whereField(fieldAlias)
.whereAlias(fieldAlias)
.whereTermAndValue(whereTerm + whereValue)
.build());
if(y.getDeType() == DeTypeConstants.DE_TIME && StringUtils.equalsIgnoreCase(f.getTerm(), "null")){
list.add(SQLObj.builder()
.whereField(fieldAlias)
.whereAlias(fieldAlias)
.whereTermAndValue("is null")
.build());
}else if(y.getDeType() == DeTypeConstants.DE_TIME && StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")){
list.add(SQLObj.builder()
.whereField(fieldAlias)
.whereAlias(fieldAlias)
.whereTermAndValue("is not null")
.build());
}else {
list.add(SQLObj.builder()
.whereField(fieldAlias)
.whereAlias(fieldAlias)
.whereTermAndValue(whereTerm + whereValue)
.build());
}
});
}
return list;

2
frontend/src/views/system/datasource/DsTree.vue
View File

@ -156,7 +156,7 @@ export default {
return 'PostgreSQL'
} else if (type === 'es') {
return 'Elasticsearch'
} else if (type === 'ch') {
} else if (type === 'ck') {
return 'ClickHouse'
}
},