Commit 9d8721b2 authored by 刘林's avatar 刘林

fix(jg):设备添加气瓶分类

parent 00986f54
......@@ -842,8 +842,11 @@ public class ZLDPStatisticsServiceImpl {
}
if (!ObjectUtils.isEmpty(map.getString("EQU_LIST_CODE"))) {
BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
String test = QueryParser.escape(map.getString("EQU_LIST_CODE"));
meBuilder.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", test));
if ("2300".equals(map.getString("EQU_LIST_CODE"))) {
meBuilder.must(QueryBuilders.matchPhraseQuery("EQU_CATEGORY_CODE", QueryParser.escape(map.getString("EQU_CATEGORY_CODE"))));
} else {
meBuilder.must(QueryBuilders.matchPhraseQuery("EQU_LIST_CODE", QueryParser.escape(map.getString("EQU_LIST_CODE"))));
}
boolMust.must(meBuilder);
}
if (!ObjectUtils.isEmpty(map.getString("EQU_LIST"))) {
......
......@@ -88,6 +88,17 @@
"refuseClaim": "0",
"sum": "0",
"type": "ropeway"
},
{
"name": "气瓶",
"code": "2300",
"image": "upload/tzs/common/image/总览压力容器.png",
"imageUrl": "upload/tzs/common/image/监管压力容器.png",
"waitClaim": "0",
"alreadyClaim": "0",
"refuseClaim": "0",
"sum": "0",
"type": "vessel"
}
],
"__other__": "监管业务使用",
......
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