|
|
@@ -173,8 +173,9 @@ public class ExpertStatisticsManage { |
|
|
|
Map<Long, ExpertUserFullInfo> expertMap = experts.stream().filter(e -> userSet.add(e.getUserId())) |
|
|
|
.collect(Collectors.toMap(ExpertUserFullInfo::getUserId, e -> e)); |
|
|
|
|
|
|
|
List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_COUNTY) |
|
|
|
.stream().sorted(Comparator.comparing(RegionDTO::getRegionCode)).collect(Collectors.toList()); |
|
|
|
List<RegionDTO> regions = regionCacheHelper.listChildren(RegionConst.RC_LS, RegionConst.RL_CITY) |
|
|
|
.stream().filter(r -> r.getRegionLevel().equals(RegionConst.RL_COUNTY)) |
|
|
|
.sorted(Comparator.comparing(RegionDTO::getRegionCode)).collect(Collectors.toList()); |
|
|
|
|
|
|
|
//是否要筛选年 |
|
|
|
experts = experts.stream().filter(e -> { |
|
|
|