Skip to content

A
amos-boot-biz
Commit 48b1333c authored by 刘林's avatar 刘林
Browse files
Options

fix(大屏):大屏企业统计总数错误，因为officeRegion导致内外不一致问题处理

parent 6117b7c3
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
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
View file @ 48b1333c
...@@ -417,9 +417,9 @@ public class ComprehensiveStatisticalAnalysisServiceImpl { ...@@ -417,9 +417,9 @@ public class ComprehensiveStatisticalAnalysisServiceImpl {
EnhancedDynamicQueryBuilder enhancedDynamicQueryBuilder = new EnhancedDynamicQueryBuilder(); EnhancedDynamicQueryBuilder enhancedDynamicQueryBuilder = new EnhancedDynamicQueryBuilder();
queryBuilder1.must(QueryBuilders.prefixQuery(superviseOrgCodeKey, "50")) queryBuilder1.must(QueryBuilders.prefixQuery(superviseOrgCodeKey, "50"))
.must(QueryBuilders.wildcardQuery("officeRegion", "*" + officeRegion + "*")); .must(QueryBuilders.wildcardQuery("officeRegion", "*" + officeRegion + "*"));
queryBuilder2.mustNot(QueryBuilders.termQuery(superviseOrgCodeKey, "50")) queryBuilder2.must(QueryBuilders.prefixQuery(superviseOrgCodeKey, orgCode));
.must(QueryBuilders.prefixQuery(superviseOrgCodeKey, orgCode));
if(type.equals(StatisticalAnalysisEnum.inspectionCompany.getCode()) || type.equals(StatisticalAnalysisEnum.inspectionPerson.getCode()) || isPage){ if(type.equals(StatisticalAnalysisEnum.inspectionCompany.getCode()) || type.equals(StatisticalAnalysisEnum.inspectionPerson.getCode()) || isPage){
// queryBuilder2.mustNot(QueryBuilders.termQuery(superviseOrgCodeKey, "50"));
enhancedDynamicQueryBuilder.add(queryBuilder1, or); enhancedDynamicQueryBuilder.add(queryBuilder1, or);
} }
enhancedDynamicQueryBuilder.add(queryBuilder2, or); enhancedDynamicQueryBuilder.add(queryBuilder2, or);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment