Commit cc294fb8 authored by Lambertliu's avatar Lambertliu

fix(jg):设备列表bug修改

parent c1878639
......@@ -698,6 +698,7 @@ public class ZLDPStatisticsServiceImpl {
List<CountDto> yData = getYDataForQZ(regionList, paramDto);
result.put("legendData", legendData);
result.put("xdata", xData);
result.put("unit", "%");
result.put("equipTotal", yData.stream().map(CountDto::getLongValue).collect(Collectors.toList()));
result.put("claimRate", yData.stream().map(CountDto::getStrValue).collect(Collectors.toList()));
return result;
......@@ -953,34 +954,36 @@ public class ZLDPStatisticsServiceImpl {
query.must(QueryBuilders.matchPhraseQuery("USE_UNIT_NAME", "*" + test + "*"));
boolMust.must(query);
}
if ("2300".equals(paramDto.getTreeValue())) {
if (!"".equals(paramDto.getEquCategoryCode())) {
// treeValue 为 "2300" 且 equCategoryCode 非空时
BoolQueryBuilder query = QueryBuilders.boolQuery();
String escapedValue = QueryParser.escape(paramDto.getEquCategoryCode());
query.must(QueryBuilders.matchPhraseQuery("EQU_DEFINE_CODE", escapedValue));
boolMust.must(query);
if (!ObjectUtils.isEmpty(paramDto.getTreeValue())) {
if ("2300".equals(paramDto.getTreeValue())) {
if (paramDto.getEquCategoryCode() != null) {
// treeValue 为 "2300" 且 equCategoryCode 非空时
BoolQueryBuilder query = QueryBuilders.boolQuery();
String escapedValue = QueryParser.escape(paramDto.getEquCategoryCode());
query.must(QueryBuilders.matchPhraseQuery("EQU_DEFINE_CODE", escapedValue));
boolMust.must(query);
} else {
// treeValue 为 "2300" 且 equCategoryCode 为空时
BoolQueryBuilder query = QueryBuilders.boolQuery();
String escapedValue = QueryParser.escape(paramDto.getTreeValue());
query.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY_CODE", escapedValue));
boolMust.must(query);
}
} else {
// treeValue 为 "2300" 且 equCategoryCode 为空
// treeValue 不为 "2300"
BoolQueryBuilder query = QueryBuilders.boolQuery();
String escapedValue = QueryParser.escape(paramDto.getTreeValue());
query.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY_CODE", escapedValue));
boolMust.must(query);
}
} else {
// treeValue 不为 "2300" 时
BoolQueryBuilder query = QueryBuilders.boolQuery();
String escapedValue = QueryParser.escape(paramDto.getTreeValue());
query.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", escapedValue));
query.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", escapedValue));
// 处理 equCategoryCode 为空的情况
if (!"".equals(paramDto.getEquCategoryCode())) {
escapedValue = QueryParser.escape(paramDto.getEquCategoryCode());
query.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY_CODE", escapedValue));
// 处理 equCategoryCode 为空的情况
if (paramDto.getEquCategoryCode() != null) {
escapedValue = QueryParser.escape(paramDto.getEquCategoryCode());
query.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY_CODE", escapedValue));
}
boolMust.must(query);
}
boolMust.must(query);
}
BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
String param = QueryParser.escape("true");
pBuilder.must(QueryBuilders.matchQuery(IS_INTO_MANAGEMENT, param));
......
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