Skip to content

A
amos-boot-biz
Commit 4c1ca550 authored by suhuiguang's avatar suhuiguang
Browse files
Options

fix(统计): 设备类别过滤

1.后端错误按照名称查询
parent 34a62a4c
Hide whitespace changes
Inline Side-by-side
Showing with 7 additions and 2 deletions
amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ZLDPStatisticsServiceImpl.java
View file @ 4c1ca550
...@@ -955,8 +955,13 @@ public class ZLDPStatisticsServiceImpl { ...@@ -955,8 +955,13 @@ public class ZLDPStatisticsServiceImpl {
}else { }else {
BoolQueryBuilder meBuilder = QueryBuilders.boolQuery(); BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString("EQU_CATEGORY")); String test = QueryParser.escape(map.getString("EQU_CATEGORY"));
meBuilder.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", test)); if (CylinderTypeEnum.CYLINDER.getCode().equals(map.getString("EQU_LIST_CODE"))) {
boolMust.must(meBuilder); meBuilder.must(QueryBuilders.termQuery("EQU_DEFINE_CODE", test));
boolMust.must(meBuilder);
} else {
meBuilder.must(QueryBuilders.termQuery("EQU_CATEGORY_CODE", test));
boolMust.must(meBuilder);
}
} }
} }
if (!ObjectUtils.isEmpty(map.getString("USE_ORG_CODE"))) { if (!ObjectUtils.isEmpty(map.getString("USE_ORG_CODE"))) {
......
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