reafact(jyjc): 西安电梯筛选

amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-api/src/main/java/com/yeejoin/amos/boot/module/jyjc/api/common/BizCommonConstant.java

@@ -127,4 +127,9 @@ public interface BizCommonConstant {
      * 业务类型-检测
      */
     String BIZ_TYPE_JC = "jc";
+
+    /**
+     * 西安
+     */
+    String XA_ORG_CODE = "50*52";
 }

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

@@ -1585,6 +1585,8 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         // 设备种类编码
         if (!ObjectUtils.isEmpty(map.getString("EQU_LIST_CODE"))) {
             boolMust.must(QueryBuilders.termQuery("EQU_LIST_CODE", QueryParser.escape(map.getString("EQU_LIST_CODE"))));
+            // todo 西安电梯时不让报检。数据去掉
+            this.disableXADT(map.getString("EQU_LIST_CODE"), boolMust);
         }
         // 设备类别
         if (!ObjectUtils.isEmpty(map.getString("EQU_CATEGORY_CODE"))) {
@@ -1667,6 +1669,17 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         return result;
     }
 
+    /**
+     * 西安电梯时不让做报检
+     * @param equListCode 设备种类
+     * @param boolMust  匹配条件
+     */
+    private void disableXADT(String equListCode, BoolQueryBuilder boolMust) {
+        if(EquipmentClassifityEnum.DT.getCode().equals(equListCode)){
+            boolMust.mustNot(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(BizCommonConstant.XA_ORG_CODE) + "*"));
+        }
+    }
+
     private void setSpecificallyFilter(BoolQueryBuilder boolMust, JSONObject map) {
         if (ObjectUtils.isEmpty(map.getString("COUNTY"))) {
             return;