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

feat: 文本搜索增加与或条件，精准、模糊匹配

Browse Source
This commit is contained in:
junjun 2024-04-10 13:57:54 +08:00
parent aebaac3baf
commit 0145f67d7d
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/core-backend/src/main/java/io/dataease/engine/trans/ExtWhere2Str.java
View File

@ -102,7 +102,13 @@ public class ExtWhere2Str {
String whereTerm = Utils.transFilterTerm(request.getOperator()); String whereTerm = Utils.transFilterTerm(request.getOperator());
String whereValue = ""; String whereValue = "";
if (StringUtils.containsIgnoreCase(request.getOperator(), "in")) { if (StringUtils.containsIgnoreCase(request.getOperator(), "-")) {
String[] split = request.getOperator().split("-");
String term1 = split[0];
String logic = split[1];
String term2 = split[2];
whereValue = term1 + getValue(term1, value.get(0)) + logic + whereName + term2 + getValue(term2, value.get(1));
} else if (StringUtils.containsIgnoreCase(request.getOperator(), "in")) {
// 过滤空数据 // 过滤空数据
if (value.contains(SQLConstants.EMPTY_SIGN)) { if (value.contains(SQLConstants.EMPTY_SIGN)) {
whereValue = "('" + StringUtils.join(value, "','") + "', '')" + " or " + whereName + " is null "; whereValue = "('" + StringUtils.join(value, "','") + "', '')" + " or " + whereName + " is null ";
@ -144,4 +150,14 @@ public class ExtWhere2Str {
meta.setExtWheresDialect(fieldsDialect); meta.setExtWheresDialect(fieldsDialect);
} }
private static String getValue(String term, String value) {
switch (term) {
case "like":
return "'%" + value + "%'";
case "eq":
return "'" + value + "'";
}
return null;
}
} }