fix 80264 未符合项-查询条件工作令编号失效
fix 80261 未符合项-查询 建议改成模糊查询 fix 80820 未符合项--建议查询条件增加设计工程师
This commit is contained in:
+8
-2
@@ -153,7 +153,7 @@ public class QueryGenerator {
|
||||
doIntervalQuery(queryWrapper, parameterMap, type, name, column);
|
||||
//判断单值 参数带不同标识字符串 走不同的查询
|
||||
//TODO 这种前后带逗号的支持分割后模糊查询需要否 使多选字段的查询生效
|
||||
addQueryWapper(queryWrapper, column, value);
|
||||
addQueryWapper(queryWrapper, column, value, type);
|
||||
|
||||
} catch (Exception e) {
|
||||
log.error(e.getMessage(), e);
|
||||
@@ -168,7 +168,7 @@ public class QueryGenerator {
|
||||
|
||||
}
|
||||
|
||||
private static void addQueryWapper(QueryWrapper<?> queryWrapper, String column, Object value) {
|
||||
private static void addQueryWapper(QueryWrapper<?> queryWrapper, String column, Object value, String type) {
|
||||
if (null != value && value.toString().startsWith(COMMA) && value.toString().endsWith(COMMA)) {
|
||||
String multiLikeval = value.toString().replace(",,", COMMA);
|
||||
String[] vals = multiLikeval.substring(1, multiLikeval.length()).split(COMMA);
|
||||
@@ -187,6 +187,12 @@ public class QueryGenerator {
|
||||
//根据参数值带什么关键字符串判断走什么类型的查询
|
||||
QueryRuleEnum rule = convert2Rule(value);
|
||||
value = replaceValue(rule,value);
|
||||
// add -begin 添加判断为字符串时设为全模糊查询
|
||||
if( (rule==null || QueryRuleEnum.EQ.equals(rule)) && "class java.lang.String".equals(type)) {
|
||||
//可以设置左右模糊或全模糊,因人而异
|
||||
rule = QueryRuleEnum.LIKE;
|
||||
}
|
||||
// add -end 添加判断为字符串时设为全模糊查询
|
||||
addEasyQuery(queryWrapper, column, rule, value);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user