Commit 11ea1e70 authored by tianyiming's avatar tianyiming

feat: 调整大屏作业人员的查询逻辑

parent cfcfd0ed
...@@ -448,6 +448,8 @@ public class JGDPStatisticsServiceImpl { ...@@ -448,6 +448,8 @@ public class JGDPStatisticsServiceImpl {
result.put(DPMapStatisticsItemEnum.PERSON_TOTAL.getCode(), 0); result.put(DPMapStatisticsItemEnum.PERSON_TOTAL.getCode(), 0);
return; return;
} }
Long num = userInfoMapper.countUserByPostAndAreaCode(orgCode, "6552", dpFilterParamDto.getCityCode());
result.put(DPMapStatisticsItemEnum.OPERATORS.getCode(), num);
staticsPersonCountByEs(orgCode, StatisticalAnalysisEnum.person.getKey(), result); staticsPersonCountByEs(orgCode, StatisticalAnalysisEnum.person.getKey(), result);
} }
...@@ -459,9 +461,9 @@ public class JGDPStatisticsServiceImpl { ...@@ -459,9 +461,9 @@ public class JGDPStatisticsServiceImpl {
BoolQueryBuilder boolMust = QueryBuilders.boolQuery(); BoolQueryBuilder boolMust = QueryBuilders.boolQuery();
boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode)); boolMust.must(QueryBuilders.prefixQuery("superviseOrgCode", orgCode));
Long personSum = statisticalAnalysisService.getStatisticCount(boolMust, key); Long personSum = statisticalAnalysisService.getStatisticCount(boolMust, key);
boolMust.must(QueryBuilders.matchQuery("newPost", "6552")); // boolMust.must(QueryBuilders.matchQuery("newPost", "6552"));
Long operatorsNum = statisticalAnalysisService.getStatisticCount(boolMust, key); // Long operatorsNum = statisticalAnalysisService.getStatisticCount(boolMust, key);
result.put(DPMapStatisticsItemEnum.OPERATORS.getCode(), operatorsNum); // result.put(DPMapStatisticsItemEnum.OPERATORS.getCode(), operatorsNum);
result.put(DPMapStatisticsItemEnum.PERSON_TOTAL.getCode(), personSum); result.put(DPMapStatisticsItemEnum.PERSON_TOTAL.getCode(), personSum);
} }
......
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