Skip to content

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

fix(jyjc): 报检规则4.0开发

1.经开、西咸、高新数据，在其他区县里剥除
parent 8cd0fb0a
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/JyjcInspectionApplicationServiceImpl.java
View file @ 78342079
...@@ -1601,8 +1601,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -1601,8 +1601,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
if (String.valueOf(BizCommonConstant.REGION_CODE_YT).equals(map.getString("COUNTY"))) { if (String.valueOf(BizCommonConstant.REGION_CODE_YT).equals(map.getString("COUNTY"))) {
// 区县筛选 // 区县筛选
boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + map.getString("COUNTY") + "*")); boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + map.getString("COUNTY") + "*"));
// 按照属地去掉高新数据 // 按照属地去掉高新数据、经开、西咸
boolMust.mustNot(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(SpeRegionInfoEnum.GX.getOrgCode()) + "*")); boolMust.mustNot(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(SpeRegionInfoEnum.GX.getOrgCode()) + "*"));
boolMust.mustNot(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(SpeRegionInfoEnum.JK.getOrgCode()) + "*"));
boolMust.mustNot(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(SpeRegionInfoEnum.XX.getOrgCode()) + "*"));
return; return;
} }
// 高新、经开、西咸时按照属地监管部门过滤 // 高新、经开、西咸时按照属地监管部门过滤
...@@ -1610,8 +1612,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec ...@@ -1610,8 +1612,10 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(Objects.requireNonNull(SpeRegionInfoEnum.getByCode(map.getInteger("COUNTY"))).getOrgCode()) + "*")); boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(Objects.requireNonNull(SpeRegionInfoEnum.getByCode(map.getInteger("COUNTY"))).getOrgCode()) + "*"));
return; return;
} }
// 区县过滤 // 其他：区县过滤+去掉分出去的经开、西咸数据
boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + map.getString("COUNTY") + "*")); boolMust.must(QueryBuilders.wildcardQuery("USE_PLACE_CODE", "*" + map.getString("COUNTY") + "*"));
boolMust.mustNot(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(SpeRegionInfoEnum.JK.getOrgCode()) + "*"));
boolMust.mustNot(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(SpeRegionInfoEnum.XX.getOrgCode()) + "*"));
} }
private void fillTechParamForGl(String equCategoryCode, List<JSONObject> list) { private void fillTechParamForGl(String equCategoryCode, List<JSONObject> list) {
......
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