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

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

@@ -44,12 +44,14 @@ import com.yeejoin.amos.boot.module.ymt.api.dto.TzBaseEnterpriseInfoDto;
 import com.yeejoin.amos.boot.module.ymt.api.entity.EquipTechParamBoiler;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectConstruction;
 import com.yeejoin.amos.boot.module.ymt.api.entity.IdxBizJgProjectContraption;
+import com.yeejoin.amos.boot.module.ymt.api.entity.TzBaseEnterpriseInfo;
 import com.yeejoin.amos.boot.module.ymt.api.enums.ApplicationFormTypeEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquimentEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.EquipmentClassifityEnum;
 import com.yeejoin.amos.boot.module.ymt.api.enums.FlowStatusEnum;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.EquipTechParamBoilerMapper;
 import com.yeejoin.amos.boot.module.ymt.api.mapper.IdxBizJgProjectContraptionMapper;
+import com.yeejoin.amos.boot.module.ymt.api.mapper.TzBaseEnterpriseInfoMapper;
 import com.yeejoin.amos.component.feign.utils.FeignUtil;
 import com.yeejoin.amos.feign.privilege.model.CompanyModel;
 import com.yeejoin.amos.feign.systemctl.model.DictionarieModel;
@@ -184,6 +186,9 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
     @Autowired
     private JyjcInspectionHistoryServiceImpl jyjcInspectionHistoryServiceImpl;
 
+    @Resource
+    private TzBaseEnterpriseInfoMapper baseEnterpriseInfoMapper;
+
 
     @NotNull
     public static List<DictionarieModel> getDictionarieModels(String bizTypes) {
@@ -1588,16 +1593,16 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
             return;
         }
         // 雁塔时去掉高新数据
-        if(String.valueOf(BizCommonConstant.REGION_CODE_YT).equals(map.getString("COUNTY"))){
+        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.GX.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()) + "*"));
+        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;
         }
         // 区县过滤
@@ -1615,16 +1620,16 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         }
     }
 
-    private static void setFilterByIndefinite(JSONObject map, String type, String companyCode, BoolQueryBuilder boolMust) {
+    private void setFilterByIndefinite(JSONObject map, String type, String companyCode, BoolQueryBuilder boolMust) {
         // 根据当前登录用户类型及管辖机构筛选条件添加对应参数
         if (!ValidationUtil.isEmpty(type) && type.contains("使用单位")) {
             boolMust.must(QueryBuilders.termQuery("USE_UNIT_CREDIT_CODE.keyword", QueryParser.escape(companyCode)));
         }
         if (!ValidationUtil.isEmpty(type) && type.contains("安装改造维修单位")) {
             BoolQueryBuilder builder = QueryBuilders.boolQuery();
-            builder.should(QueryBuilders.wildcardQuery("USC_UNIT_CREDIT_CODE", "*" + QueryParser.escape(companyCode).toLowerCase() + "*"));
-            String useUnitCode = map.getString("useUnitCreditCode");
-            builder.should(QueryBuilders.termQuery("USE_UNIT_CREDIT_CODE.keyword", QueryParser.escape(useUnitCode)));
+            builder.must(QueryBuilders.wildcardQuery("USC_UNIT_CREDIT_CODE", "*" + QueryParser.escape(companyCode.toLowerCase()) + "*"));
+            String useUnitCode = getUseUnitCreditBySeq(map.getString("useUnitCreditCode"));
+            builder.must(QueryBuilders.termQuery("USE_UNIT_CREDIT_CODE.keyword", QueryParser.escape(useUnitCode.toLowerCase())));
             boolMust.must(builder);
         }
         if (!ValidationUtil.isEmpty(type) && type.contains("个人主体")) {
@@ -1632,6 +1637,13 @@ public class JyjcInspectionApplicationServiceImpl extends BaseService<JyjcInspec
         }
     }
 
+    private String getUseUnitCreditBySeq(String seq) {
+        TzBaseEnterpriseInfo enterpriseInfo = baseEnterpriseInfoMapper.selectOne(new LambdaQueryWrapper<TzBaseEnterpriseInfo>()
+                .eq(com.yeejoin.amos.boot.biz.common.entity.BaseEntity::getSequenceNbr, seq)
+                .select(com.yeejoin.amos.boot.biz.common.entity.BaseEntity::getSequenceNbr, TzBaseEnterpriseInfo::getUseUnitCode));
+        return enterpriseInfo.getUseUnitCode();
+    }
+
 
     /**
      * 过滤条件去掉流程中的设备,