大屏bug修改

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

@@ -30,7 +30,6 @@ import com.yeejoin.amos.boot.biz.common.utils.*;
 import com.yeejoin.amos.boot.module.common.api.dao.ESEquipmentCategory;
 import com.yeejoin.amos.boot.module.common.api.dto.ESEquipmentCategoryDto;
 import com.yeejoin.amos.boot.module.common.api.enums.CylinderTypeEnum;
-import com.yeejoin.amos.boot.module.common.api.enums.StatisticalAnalysisEnum;
 import com.yeejoin.amos.boot.module.common.api.mapper.CustomBaseMapper;
 import com.yeejoin.amos.boot.module.common.biz.refresh.DataRefreshEvent;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.EquipmentCategoryService;
@@ -70,6 +69,7 @@ import org.elasticsearch.action.search.SearchResponse;
 import org.elasticsearch.client.RequestOptions;
 import org.elasticsearch.client.RestHighLevelClient;
 import org.elasticsearch.index.query.BoolQueryBuilder;
+import org.elasticsearch.index.query.Operator;
 import org.elasticsearch.index.query.QueryBuilders;
 import org.elasticsearch.search.SearchHit;
 import org.elasticsearch.search.builder.SearchSourceBuilder;
@@ -2541,7 +2541,7 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         Integer size = ObjectUtils.isEmpty(map.getInteger("size")) ? 20 : map.getInteger("size");
         Page<JSONObject> result = new Page<>(pageNumber, size);
         SearchRequest request = new SearchRequest();
-        request.indices(StatisticalAnalysisEnum.equip.getKey());
+        request.indices("idx_biz_view_jg_all");
         SearchSourceBuilder builder = new SearchSourceBuilder();
         builder.trackTotalHits(true);
         BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
@@ -2579,20 +2579,20 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
 
         // 默认条件【STATUS==="" || null】
         BoolQueryBuilder meBuilder = QueryBuilders.boolQuery();
-        meBuilder.should(QueryBuilders.matchQuery("STATUS", "已认领"));
+        meBuilder.should(QueryBuilders.termQuery("STATUS", "已认领"));
         meBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery("STATUS")));
-        meBuilder.should(QueryBuilders.boolQuery().must(QueryBuilders.matchPhraseQuery("STATUS", "")));
+        meBuilder.should(QueryBuilders.boolQuery().must(QueryBuilders.termQuery("STATUS", "")));
         meBuilder.minimumShouldMatch(1);
         boolMust.must(meBuilder);
 
-        //默认条件 限制西安电梯隶属导入数据不可做业务
-        if (ObjectUtils.isEmpty(map.getString(IS_DO_BUSINESS))) {
-            BoolQueryBuilder tBuilder = QueryBuilders.boolQuery();
-            tBuilder.should(QueryBuilders.matchQuery(IS_DO_BUSINESS, true));
-            tBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery(IS_DO_BUSINESS)));
-            tBuilder.minimumShouldMatch(1);
-            boolMust.must(tBuilder);
-        }
+//        //默认条件 限制西安电梯隶属导入数据不可做业务
+//        if (ObjectUtils.isEmpty(map.getString(IS_DO_BUSINESS))) {
+//            BoolQueryBuilder tBuilder = QueryBuilders.boolQuery();
+//            tBuilder.should(QueryBuilders.matchQuery(IS_DO_BUSINESS, true));
+//            tBuilder.should(QueryBuilders.boolQuery().mustNot(QueryBuilders.existsQuery(IS_DO_BUSINESS)));
+//            tBuilder.minimumShouldMatch(1);
+//            boolMust.must(tBuilder);
+//        }
 
         // DATA_SOURCE 为“jg”开头的数据（从监管新加或复制的设备）
         // 20240314 提出的监管业务不要让企业用户选到之前一码通认领或补录的设备，让从监管业务中去新增
@@ -2927,11 +2927,11 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
             boolMust.must(pBuilder);
         }
         // 使用单位 名称模糊查询
-        if (!ObjectUtils.isEmpty(map.getString("USE_UNIT_NAME"))) {
-            BoolQueryBuilder query = QueryBuilders.boolQuery();
-            String test = QueryParser.escape(map.getString("USE_UNIT_NAME"));
-            query.must(QueryBuilders.wildcardQuery("USE_UNIT_NAME", "*" + test + "*"));
-            boolMust.must(query);
+        if (!ObjectUtils.isEmpty(map.getString(USE_UNIT_NAME))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String text = map.getString(USE_UNIT_NAME);
+            pBuilder.must(QueryBuilders.matchQuery(USE_UNIT_NAME, text).operator(Operator.AND));
+            boolMust.must(pBuilder);
         }
         // 模糊查询
         if (!ObjectUtils.isEmpty(map.getString(USE_PLACE_CODE))) {
@@ -2948,14 +2948,14 @@ public class IdxBizJgRegisterInfoServiceImpl extends BaseService<IdxBizJgRegiste
         }
         // 增加监管端查询, 查询规则看到本级及之下的设备
         if(companyLevel.equals(BaseController.COMPANY_TYPE_SUPERVISION)){
-            boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(company.getString("orgCode")) + "*"));
+            boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE.keyword", company.getString("orgCode")));
         }
-        // 增加监管端查询, 查询规则看到本级及之下的设备
+        // 属地监管部门过滤
         if(!ObjectUtils.isEmpty(map.getString("ORG_BRANCH_CODE"))){
             if(companyLevel.equals(BaseController.COMPANY_TYPE_SUPERVISION)) { // 监管 右模糊查询
-                boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(map.getString("ORG_BRANCH_CODE")) + "*"));
+                boolMust.must(QueryBuilders.prefixQuery("ORG_BRANCH_CODE.keyword", map.getString("ORG_BRANCH_CODE")));
             } else {                                                           // 企业 等于查询
-                boolMust.must(QueryBuilders.wildcardQuery("ORG_BRANCH_CODE.keyword", QueryParser.escape(map.getString("ORG_BRANCH_CODE")) + "*"));
+                boolMust.must(QueryBuilders.termQuery("ORG_BRANCH_CODE.keyword", map.getString("ORG_BRANCH_CODE")));
             }
         }
         // 创建时间范围查询

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-api/src/main/resources/mapper/JGStatisticsMapper.xml

@@ -344,15 +344,14 @@
             ur.rec_date
     </select>
     <select id="certificateCountByOrgCode" resultType="java.lang.Long">
-        SELECT COUNT
-                   (1)
+        SELECT
+            COUNT (1)
         FROM
             tzs_jg_use_registration_manage A
-                INNER JOIN privilege_company C ON A.receive_company_code = C.company_code
         WHERE
-            C.org_code LIKE concat ( #{orgCode}, '%' )
-        and A.certificate_status = '已登记'
-        and A.is_delete = 0
+            A.supervise_org_code LIKE concat ( #{orgCode}, '%' )
+            and A.certificate_status = '已登记'
+            and A.is_delete = 0
     </select>
 
     <select id="useCountByOrgCode" resultType="java.lang.Long">