From 5387dbda0b72726411279f634d9fdcd2cb042054 Mon Sep 17 00:00:00 2001 From: PoffyZhang <99775271@qq.com> Date: Fri, 1 Dec 2023 14:22:40 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=93=E5=AE=B6=20=E7=AE=97=E5=B1=A5?= =?UTF-8?q?=E8=81=8C=E6=84=8F=E5=90=91=E5=8C=BA=E5=9F=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scheduler/task/CockpitStatsStatisticsTask.java | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java index 27e7fde..4af38ac 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/scheduler/task/CockpitStatsStatisticsTask.java @@ -16,7 +16,9 @@ import com.ningdatech.pmapi.dashboard.constant.DashboardConstant; import com.ningdatech.pmapi.dashboard.model.entity.CockpitStats; import com.ningdatech.pmapi.dashboard.model.po.SecrecyPasswordGradePO; import com.ningdatech.pmapi.dashboard.service.ICockpitStatsService; +import com.ningdatech.pmapi.expert.entity.ExpertIntentionWorkRegion; import com.ningdatech.pmapi.expert.entity.ExpertUserFullInfo; +import com.ningdatech.pmapi.expert.service.IExpertIntentionWorkRegionService; import com.ningdatech.pmapi.expert.service.IExpertUserFullInfoService; import com.ningdatech.pmapi.gov.enumeration.GovProjectStatusEnum; import com.ningdatech.pmapi.gov.model.entity.*; @@ -107,6 +109,9 @@ public class CockpitStatsStatisticsTask { @Autowired private IEarlyWarningRecordsService earlyWarningRecordsService; + @Autowired + private IExpertIntentionWorkRegionService expertIntentionWorkRegionService; + private List years = Lists.newArrayList(2021,2022,2023,2024,2025); private final IMetaTagService metaTagService; @@ -370,12 +375,20 @@ public class CockpitStatsStatisticsTask { //2.专家统计 List lsRegionCodes = RegionConst.LS_ARR; - List experts = expertUserFullInfoService.list(Wrappers.lambdaQuery(ExpertUserFullInfo.class) + List intentions = expertIntentionWorkRegionService.list(Wrappers.lambdaQuery(ExpertIntentionWorkRegion.class) .eq(StringUtils.isNotBlank(regionCode) && !DashboardConstant.CockpitStats.TOTAL.equals(regionCode), - ExpertUserFullInfo::getRegionCode, regionCode) + ExpertIntentionWorkRegion::getRegionCode, regionCode) .in(StringUtils.isBlank(regionCode) || DashboardConstant.CockpitStats.TOTAL.equals(regionCode), - ExpertUserFullInfo::getRegionCode,lsRegionCodes) - .eq(ExpertUserFullInfo::getExpertAccountStatus,"available")); + ExpertIntentionWorkRegion::getRegionCode, lsRegionCodes)); + + List experts = Lists.newArrayList(); + if(CollUtil.isNotEmpty(intentions)){ + List userIds = intentions.stream().map(ExpertIntentionWorkRegion::getUserId) + .collect(Collectors.toList()); + experts = expertUserFullInfoService.list(Wrappers.lambdaQuery(ExpertUserFullInfo.class) + .in(ExpertUserFullInfo::getUserId, userIds) + .eq(ExpertUserFullInfo::getExpertAccountStatus,"available")); + } List goodAt = expertTagService.list(Wrappers.lambdaQuery(ExpertTag.class)); Map> tagMap = goodAt.stream()