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

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/edit/process/equip/EquipChangeDataUpdateServiceImpl.java

@@ -179,6 +179,7 @@ public class EquipChangeDataUpdateServiceImpl {
             esEquipmentCategoryDto.setEQU_CATEGORY_CODE(registerChangeDataDto.getEquCategory());
             esEquipmentCategoryDto.setEQU_DEFINE_CODE(registerChangeDataDto.getEquDefine());
             esEquipmentCategoryDto.setUSE_ORG_CODE(registerChangeDataDto.getUseOrgCode());
+            esEquipmentCategoryDto.setWhetherSphericalTank(registerChangeDataDto.getWhetherSphericalTank());
             // 冗余设备类别名称
             if (StringUtils.isEmpty(registerChangeDataDto.getEquCategory())) {
                 esEquipmentCategoryDto.setEQU_CATEGORY(null);

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

@@ -149,7 +149,7 @@ public class EnableRuleDataPreparationService {
             // 是否球罐 0 1 转 boolean
             inspectionEquipInfo.setIsBallValve(!"0".equals(registrationInfo.getWhetherSphericalTank()));
             // 标签
-            inspectionEquipInfo.setEquipTag1(registrationInfo.getTag1());
+            inspectionEquipInfo.setEquipTag1(equipInfoModel.getEquipTag1());
         }
         if (PRESSURE_EQU_LIST.contains(equipInfoModel.getEquList())) {
             ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(equipInfoModel.getUserId(), equipInfoModel.getToken())).toString(), ReginParams.class);

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

@@ -1503,12 +1503,12 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             boolMust.must(QueryBuilders.matchPhraseQuery("USE_INNER_CODE", test));
         }
         // 大型游乐设施时按照设备分类过滤
-        if(!ObjectUtils.isEmpty(map.getString("tag1")) && EquipmentClassifityEnum.YLSS.getCode().equals(map.getString("EQU_LIST_CODE"))){
-            boolMust.must(QueryBuilders.termQuery("tag1.keyword", QueryParser.escape(map.getString("tag1"))));
+        if(!ObjectUtils.isEmpty(map.getString("equipTag1")) && EquipmentClassifityEnum.YLSS.getCode().equals(map.getString("EQU_LIST_CODE"))){
+            boolMust.must(QueryBuilders.termQuery("tag1.keyword", QueryParser.escape(map.getString("equipTag1"))));
         }
         // 固定式压力容器按照是否球罐过滤
-        if(!ObjectUtils.isEmpty(map.getString("tag1")) && BizCommonConstant.EQU_CATEGORY_CODE_GDYLRQ.equals(map.getString("EQU_CATEGORY_CODE"))){
-            boolMust.must(QueryBuilders.termQuery("WHETHER_SPHERICAL_TANK.keyword", QueryParser.escape(map.getString("tag1"))));
+        if(!ObjectUtils.isEmpty(map.getString("equipTag1")) && BizCommonConstant.EQU_CATEGORY_CODE_GDYLRQ.equals(map.getString("EQU_CATEGORY_CODE"))){
+            boolMust.must(QueryBuilders.termQuery("WHETHER_SPHERICAL_TANK.keyword", QueryParser.escape(map.getString("equipTag1"))));
         }
         this.setFilterOfInFlowing(boolMust, map.getString("EQU_LIST_CODE"), map.getString("inspectionType"), map.getString("EQU_CATEGORY_CODE"));
         builder.query(boolMust);