Commit 68e34d2d authored by suhuiguang's avatar suhuiguang

1.1.历史无证设备可做检验

parent 9b6767bd
...@@ -1273,7 +1273,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -1273,7 +1273,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
if ("5000".equals(equListCode) && JYJCBusinessTypeEnum.SCJY.getCode().equals(inspectionType)) { if ("5000".equals(equListCode) && JYJCBusinessTypeEnum.SCJY.getCode().equals(inspectionType)) {
boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", false)); boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", false));
} else { } else {
boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true)); BoolQueryBuilder shouldBuilder = QueryBuilders.boolQuery();
// 历史无证设备可做检验
shouldBuilder.should(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
shouldBuilder.should(QueryBuilders.prefixQuery("DATA_SOURCE", "jg_his_black"));
shouldBuilder.minimumShouldMatch(1);
boolMust.must(shouldBuilder);
} }
boolMust.must(QueryBuilders.existsQuery("IS_INTO_MANAGEMENT")); boolMust.must(QueryBuilders.existsQuery("IS_INTO_MANAGEMENT"));
} }
......
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