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

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/model/InspectionEquipData.java

@@ -67,7 +67,7 @@ public class InspectionEquipData {
     @ApiModelProperty(value = "出厂编号")
     private String factoryNum;
 
-    @ApiModelProperty(value = " 制造日期")
+    @ApiModelProperty(value = "制造日期")
     private String produceDate;
 
     @ApiModelProperty(value = "登记机关")

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

@@ -114,6 +114,11 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     private static final String EQU_CODE = "EQU_CODE";
     private static final String SEQUENCE_NBR = "SEQUENCE_NBR";
     private static final String SUMMIT_TYPE = "0";
+    /**
+     * 机电类设备种类
+     */
+    private static final String JD_EQU_LIST_CODES = "3000,4000,5000";
+
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
     @Autowired
@@ -1600,25 +1605,32 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         if (BizCommonConstant.NONE.equals(map.getString("COUNTY"))) {
             return;
         }
-        // 雁塔时去掉高新数据
-        if (String.valueOf(BizCommonConstant.REGION_CODE_YT).equals(map.getString("COUNTY"))) {
-            // 区县筛选
+        // 设备种类
+        String equListCode = map.getString("EQU_LIST_CODE");
+        // 机电类才按照属地+区县过滤，其他还是按照属地过滤（区县里没特殊的高新、经开、西咸）
+        if(JD_EQU_LIST_CODES.contains(equListCode)) {
+            // 雁塔时去掉高新数据
+            if (String.valueOf(BizCommonConstant.REGION_CODE_YT).equals(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.JK.getOrgCode()) + "*"));
+                boolMust.mustNot(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(SpeRegionInfoEnum.XX.getOrgCode()) + "*"));
+                return;
+            }
+            // 高新、经开、西咸时按照属地监管部门过滤
+            if (Arrays.stream(SpeRegionInfoEnum.values()).sequential().anyMatch(r -> r.getCode().equals(map.getIntValue("COUNTY")))) {
+                boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(Objects.requireNonNull(SpeRegionInfoEnum.getByCode(map.getInteger("COUNTY"))).getOrgCode()) + "*"));
+                return;
+            }
+            // 其他：区县过滤+去掉分出去的经开、西咸数据
             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.JK.getOrgCode()) + "*"));
             boolMust.mustNot(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(SpeRegionInfoEnum.XX.getOrgCode()) + "*"));
-            return;
-        }
-        // 高新、经开、西咸时按照属地监管部门过滤
-        if (Arrays.stream(SpeRegionInfoEnum.values()).sequential().anyMatch(r -> r.getCode().equals(map.getIntValue("COUNTY")))) {
-            boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(Objects.requireNonNull(SpeRegionInfoEnum.getByCode(map.getInteger("COUNTY"))).getOrgCode()) + "*"));
-            return;
+        } else {
+            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) {