Commit c1065979 authored by 刘林's avatar 刘林

fix(jyjc):检验检测--首检应该是在设备未走使用登记之前的检验

parent cd1bf286
...@@ -1288,13 +1288,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -1288,13 +1288,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
if (records != null && !records.isEmpty()) { if (records != null && !records.isEmpty()) {
boolMust.mustNot(QueryBuilders.termsQuery("SEQUENCE_NBR.keyword", records)); boolMust.mustNot(QueryBuilders.termsQuery("SEQUENCE_NBR.keyword", records));
} }
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 {
boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
} }
// 只有纳管的设备才能做业务
boolMust.must(QueryBuilders.existsQuery("IS_INTO_MANAGEMENT")); boolMust.must(QueryBuilders.existsQuery("IS_INTO_MANAGEMENT"));
boolMust.must(QueryBuilders.termQuery("IS_INTO_MANAGEMENT", true));
} }
private Set<String> getEquipInFlowing() { private Set<String> getEquipInFlowing() {
......
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