Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

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

@@ -310,6 +310,15 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
 
         if (!ObjectUtils.isEmpty(filter.get("filterParams"))) {
             filterParams = JSONObject.parseObject(JSONObject.toJSONString(filter.get("filterParams")));
+            if (filterParams.containsKey("dp_filter_business_type")) {
+                String businessType = filterParams.getString("dp_filter_business_type");
+                if (StatisticalAnalysisEnum.person.getCode().equals(businessType)) {
+                    companyBoolMust(boolMust, "company");
+                } else if (StatisticalAnalysisEnum.inspectionPerson.getCode().equals(businessType)) {
+                    companyBoolMust(boolMust, "inspection");
+                    boolMust.mustNot(QueryBuilders.wildcardQuery("unitType.keyword", "*检验检测机构*"));
+                }
+            }
             // 组装人员过滤条件
             this.getPersonBoolQueryBuilder(filterParams, boolMust, filterType);
             if ("custom".equals(filterType)) {
@@ -550,6 +559,15 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
         String filterType = filter.getString("filterType");
 
         if (!ObjectUtils.isEmpty(filter.get("filterParams"))) {
+            if (filterParams.containsKey("dp_filter_business_type")) {
+                String businessType = filterParams.getString("dp_filter_business_type");
+                if (StatisticalAnalysisEnum.company.getCode().equals(businessType)) {
+                    companyBoolMust(boolMust, businessType);
+                } else if (StatisticalAnalysisEnum.inspectionCompany.getCode().equals(businessType)) {
+                    companyBoolMust(boolMust, "inspection");
+                    boolMust.mustNot(QueryBuilders.wildcardQuery("unitType.keyword", "*检验检测机构*"));
+                }
+            }
             getCompanyBoolQueryBuilder(filterParams, filterType, boolMust);
         }