refeat(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/common/BizCommonConstant.java

@@ -58,4 +58,9 @@ public interface BizCommonConstant {
      * 出场编号
      */
     String FACTORY_NUM = "FACTORY_NUM";
+
+    /**
+     * 固定式压力容器
+     */
+    String EQU_CATEGORY_CODE_GDYLRQ = "2100";
 }

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

@@ -1507,7 +1507,7 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             boolMust.must(QueryBuilders.termQuery("tag1.keyword", QueryParser.escape(map.getString("tag1"))));
         }
         // 固定式压力容器按照是否球罐过滤
-        if(!ObjectUtils.isEmpty(map.getString("tag1")) && EquipmentClassifityEnum.YLSS.getCode().equals(map.getString("EQU_CATEGORY_CODE"))){
+        if(!ObjectUtils.isEmpty(map.getString("tag1")) && BizCommonConstant.EQU_CATEGORY_CODE_GDYLRQ.equals(map.getString("EQU_CATEGORY_CODE"))){
             boolMust.must(QueryBuilders.termQuery("WHETHER_SPHERICAL_TANK", QueryParser.escape(map.getString("tag1"))));
         }
         this.setFilterOfInFlowing(boolMust, map.getString("EQU_LIST_CODE"), map.getString("inspectionType"), map.getString("EQU_CATEGORY_CODE"));