1.已纳管设备列表增加监管端查询显示-按照属地监管部门，右模糊查询

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgProjectContraptionServiceImpl.java

@@ -2,10 +2,13 @@ package com.yeejoin.amos.boot.module.jg.biz.service.impl;
 
 import java.util.stream.Stream;
 import java.util.stream.Collectors;
+
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.module.jg.api.enums.CompanyTypeEnum;
 import com.yeejoin.amos.boot.module.jg.api.enums.EquipSourceEnum;
 import com.yeejoin.amos.boot.module.jg.biz.service.IIdxBizJgProjectContraptionService;
@@ -76,6 +79,14 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
         return Boolean.TRUE;
     }
 
+    private String getCompanyLevel(CompanyBo company) {
+        if (BaseController.COMPANY_TYPE_COMPANY.equals(company.getLevel())) {
+            return BaseController.COMPANY_TYPE_COMPANY;
+        } else {
+            return BaseController.COMPANY_TYPE_SUPERVISION;
+        }
+    }
+
     /**
      * 根据入参 分页查询（当前）单位下的工程管道
      *
@@ -103,10 +114,15 @@ public class IdxBizJgProjectContraptionServiceImpl extends BaseService<IdxBizJgP
         String equCategory = params.get(EQU_CATEGORY);
         // 设备类品种code
         String equDefine = params.get(EQU_DEFINE);
+        // 登录人公司类型：企业，监管
+        String companyLevel = this.getCompanyLevel(company);
         IPage<IdxBizJgProjectContraption> pageList = lambdaQuery()
-                .eq(CompanyTypeEnum.CONSTRUCTION.getName().equals(companyType), IdxBizJgProjectContraption::getUscUnitCreditCode, companyCode)
-                .eq(CompanyTypeEnum.USE.getName().equals(companyType), IdxBizJgProjectContraption::getUseUnitCreditCode, companyCode)
-                .eq(CompanyTypeEnum.INDIVIDUAL.getName().equals(companyType), IdxBizJgProjectContraption::getUseUnitCreditCode, companyCode.split("_").length > 1 ? companyCode.split("_")[1] : companyCode)
+                // 企业按照公司类型进行过滤
+                .eq(BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel) && CompanyTypeEnum.CONSTRUCTION.getName().equals(companyType), IdxBizJgProjectContraption::getUscUnitCreditCode, companyCode)
+                .eq(BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel) && CompanyTypeEnum.USE.getName().equals(companyType), IdxBizJgProjectContraption::getUseUnitCreditCode, companyCode)
+                .eq(BaseController.COMPANY_TYPE_COMPANY.equals(companyLevel) && CompanyTypeEnum.INDIVIDUAL.getName().equals(companyType), IdxBizJgProjectContraption::getUseUnitCreditCode, companyCode.split("_").length > 1 ? companyCode.split("_")[1] : companyCode)
+                // 监管机构按照属地监管部门orgCode进行过滤
+                .likeRight(BaseController.COMPANY_TYPE_SUPERVISION.equals(companyLevel), IdxBizJgProjectContraption::getOrgCode, company.getOrgCode())
                 .eq(!ValidationUtil.isEmpty(params.get(IS_INTO_MANAGEMENT)), IdxBizJgProjectContraption::getIsIntoManagement, isIntoManagement)
                 .eq(!ValidationUtil.isEmpty(useRegistrationCode), IdxBizJgProjectContraption::getUseRegistrationCode, useRegistrationCode)
                 .eq(!ValidationUtil.isEmpty(equCategory), IdxBizJgProjectContraption::getEquCategory, equCategory)

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/service/impl/IdxBizJgRegisterInfoServiceImpl.java

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.Joiner;
 import com.yeejoin.amos.boot.biz.common.bo.CompanyBo;
 import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
 import com.yeejoin.amos.boot.biz.common.service.impl.DataDictionaryServiceImpl;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
@@ -2250,13 +2251,12 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         String companyCode = company.getString("companyCode").contains("_") ?
                 company.getString("companyCode").split("_")[1] : company.getString("companyCode");
         String type = company.getString("companyType");
-
-
         // 根据当前登录人查询
         if (!ValidationUtil.isEmpty(map.get(EQUSTATE))) {
             map.put(EQUSTATE, EquimentEnum.getCode.get(map.get(EQUSTATE).toString()).toString());
         }
-
+        // 登录人公司类型：企业，监管
+        String companyLevel = this.getCompanyLevel(company);
         // 根据当前登录用户类型及管辖机构筛选条件添加对应参数
         if (ObjectUtils.isEmpty(map.getString(SEQUENCE_NBR)) && ObjectUtils.isEmpty(map.getString("useUnitCreditCode"))) {
             if (!ValidationUtil.isEmpty(type) && type.contains("使用单位")) {
@@ -2555,6 +2555,10 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             pBuilder.must(QueryBuilders.termsQuery("PROJECT_CONTRAPTION.keyword", map.getString(PROJECT_CONTRAPTION)));
             boolMust.must(pBuilder);
         }
+        // 增加监管端查询, 查询规则看到本级及之下的设备
+        if(companyLevel.equals(BaseController.COMPANY_TYPE_SUPERVISION)){
+            boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(company.getString("orgCode")) + "*"));
+        }
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
         builder.from((pageNumber - 1) * size);
@@ -2648,6 +2652,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         return result;
     }
 
+    private String getCompanyLevel(JSONObject company) {
+        if (BaseController.COMPANY_TYPE_COMPANY.equals(company.getString("level"))) {
+            return BaseController.COMPANY_TYPE_COMPANY;
+        } else {
+            return BaseController.COMPANY_TYPE_SUPERVISION;
+        }
+    }
+
 
     /**
      * 设备注册信息分页查询