refactor(jyjc) ：报检规则

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/event/rule/service/EnableRuleDataPreparationService.java

@@ -167,9 +167,6 @@ public class EnableRuleDataPreparationService {
         if (EquipmentClassifityEnum.YLSS.getCode().equals(equipInfoModel.getEquList())) {
             // 设备分类
             inspectionEquipInfo.setEquipTag1(equipInfoModel.getEquipTag1());
-            // 使用单位
-            String useUnitCode = this.getUseInfo(equipInfoModel.getRecord());
-            inspectionEquipInfo.setUseUnitCreditCode(useUnitCode);
         }
         // 锅炉设置技术参数
         if (EquipmentClassifityEnum.GL.getCode().equals(equipInfoModel.getEquList())) {

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

@@ -132,7 +132,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     /**
      * 机电类设备种类
      */
-    private static final String JD_EQU_LIST_CODES = "3000,4000,5000";
+    private static final String JD_EQU_LIST_CODES = "3000,4000,5000,6000";
 
     @Autowired
     TzsServiceFeignClient tzsServiceFeignClient;
@@ -1753,7 +1753,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         }
         // 设备种类
         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"))) {
@@ -1765,7 +1765,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
                 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;