Commit 303dd809 authored by tianyiming's avatar tianyiming

过滤高级筛选无效筛选项

parent 80618b45
...@@ -730,7 +730,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl { ...@@ -730,7 +730,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
case "notLike": case "notLike":
NestedQueryBuilder notLikeQuery = QueryBuilders.nestedQuery( NestedQueryBuilder notLikeQuery = QueryBuilders.nestedQuery(
path, path,
QueryBuilders.boolQuery().must(QueryBuilders.wildcardQuery(path+stringEnd, "*" + value + "*")), QueryBuilders.boolQuery().must(QueryBuilders.wildcardQuery(path + stringEnd, "*" + value + "*")),
ScoreMode.Avg ScoreMode.Avg
); );
if (isCustom) { if (isCustom) {
...@@ -901,12 +901,14 @@ public class ComprehensiveStatisticalAnalysisServiceImpl { ...@@ -901,12 +901,14 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
// 如果只有技术参数或者只有参数范围,则舍弃对应的分组 // 如果只有技术参数或者只有参数范围,则舍弃对应的分组
group.forEach(item -> { group.forEach(item -> {
JSONObject itemObj = JSONObject.parseObject(JSONObject.toJSONString(item)); JSONObject itemObj = JSONObject.parseObject(JSONObject.toJSONString(item));
if (itemObj.getString("field").equals("techParam")) { if (itemObj.containsKey("field") && itemObj.containsKey("value")) {
techParam.putAll(itemObj); if (itemObj.getString("field").equals("techParam")) {
} else if (itemObj.getString("field").equals("paramRange")) { techParam.putAll(itemObj);
paramRange.putAll(itemObj); } else if (itemObj.getString("field").equals("paramRange")) {
} else { paramRange.putAll(itemObj);
resultGroup.add(itemObj); } else {
resultGroup.add(itemObj);
}
} }
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment