refactor: 提取人员过滤条件构建逻辑到新方法

amos-boot-system-tzs/amos-boot-module-statistics/amos-boot-module-statistics-biz/src/main/java/com/yeejoin/amos/boot/module/statistcs/biz/service/impl/ComprehensiveStatisticalAnalysisServiceImpl.java

@@ -320,7 +320,8 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             }
             // 组装人员过滤条件
             String orgCode = filter.getString("orgCode");
-            this.getPersonBoolQueryBuilder(filterParams, boolMust, filterType, orgCode);
+            personOrgCodeBoolMust(orgCode, boolMust);
+            this.getPersonBoolQueryBuilder(filterParams, boolMust, filterType);
             if ("custom".equals(filterType)) {
                 JSONArray leftGroup = filterParams.getJSONArray("group1");
                 JSONArray rightGroup = filterParams.getJSONArray("group2");
@@ -400,16 +401,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         return result;
     }
 
-    /**
-     * 组装人员过滤条件
-     */
-    private void getPersonBoolQueryBuilder(JSONObject filterParams, BoolQueryBuilder boolMust, String filterType, String orgCode) {
-        deleteUnitCategory(filterParams);
-        // 快捷筛选和自定义筛选解析筛选规则不一致
-        if (filterType.equals("advanced")) {
-            JSONArray unitType = filterParams.getJSONArray("unitType");
-            if (!ObjectUtils.isEmpty(unitType)) {
-                if (unitType.contains("检验机构") || unitType.contains("检测机构")) {
+    private void personOrgCodeBoolMust(String orgCode, BoolQueryBuilder boolMust) {
         String officeRegion = commonMapper.getCompanyCodeByOrgCode(orgCode);
         BoolQueryBuilder queryBuilder1 = QueryBuilders.boolQuery();
         BoolQueryBuilder queryBuilder2 = QueryBuilders.boolQuery();
@@ -421,10 +413,15 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         enhancedDynamicQueryBuilder.add(queryBuilder1, or);
         enhancedDynamicQueryBuilder.add(queryBuilder2, or);
         boolMust.must(enhancedDynamicQueryBuilder.build());
-                } else {
-                    boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
-                }
     }
+
+    /**
+     * 组装人员过滤条件
+     */
+    private void getPersonBoolQueryBuilder(JSONObject filterParams, BoolQueryBuilder boolMust, String filterType) {
+        deleteUnitCategory(filterParams);
+        // 快捷筛选和自定义筛选解析筛选规则不一致
+        if (filterType.equals("advanced")) {
             filterParams.forEach((k, v) -> {
                 if (v instanceof JSONArray) {
                     if (!((JSONArray) v).contains("all") && ((JSONArray) v).size() > 0) {
@@ -3084,13 +3081,13 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
             boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
             data = queryDpCompanyStatistics(filter, request, builder, boolMust, tabTotalMap);
         } else if (StatisticalAnalysisEnum.person.getCode().equals(businessType)) {
-//            boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
+            personOrgCodeBoolMust(orgCode, boolMust);
             data = queryDpPersonStatistics(filter, request, builder, boolMust, tabTotalMap);
         } else if (StatisticalAnalysisEnum.inspectionCompany.getCode().equals(businessType)) {
             boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode.keyword", orgCode));
             data = queryDpInspectionCompanyStatistics(filter, request, builder, boolMust, tabTotalMap);
         } else {
-//            boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
+            personOrgCodeBoolMust(orgCode, boolMust);
             data = queryDpInspectionPersonStatistics(filter, request, builder, boolMust, tabTotalMap);
         }
 
@@ -3107,7 +3104,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         JSONObject filterParams = JSONObject.parseObject(JSONObject.toJSONString(filter.get("filterParams")));
         String filterType = "advanced";
         // 组装人员过滤条件
-        this.getPersonBoolQueryBuilder(filterParams, boolMust, filterType, filter.getString("orgCode"));
+        this.getPersonBoolQueryBuilder(filterParams, boolMust, filterType);
         // 通过是否传参 unitType 单位类型 区分一二级查询
         boolean is2LeveFlag = Optional.of(filter)
                 .map(obj -> obj.getJSONObject("filterParams"))
@@ -3291,7 +3288,7 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         String filterType = "advanced";
         String unitCategory = filterParams.getString("unitCategory");
         // 组装人员过滤条件
-        this.getPersonBoolQueryBuilder(filterParams, boolMust, filterType, filter.getString("orgCode"));
+        this.getPersonBoolQueryBuilder(filterParams, boolMust, filterType);
 
         // 通过是否传参 unitType 单位类型 区分一二级查询
         boolean is2LeveFlag = Optional.of(filter)
@@ -3973,8 +3970,8 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         JSONObject filterParams = JSONObject.parseObject(JSONObject.toJSONString(filter.get("filterParams")));
         String filterType = "advanced";
         // 组装人员过滤条件
-        this.getPersonBoolQueryBuilder(filterParams, boolQuery, filterType, orgCode);
-
+        personOrgCodeBoolMust(orgCode, boolQuery);
+        this.getPersonBoolQueryBuilder(filterParams, boolQuery, filterType);
         // 查询
         JSONObject expiryDateStatus = this.getExpiryDateStatusGroupStatistics(boolQuery);
         JSONObject personType = this.getPersonTypeGroupStatistics(boolQuery);