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

This commit is contained in:
517612449@qq.com
2022-06-30 10:01:50 +08:00

View File

@ -44,15 +44,16 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
@Override @Override
public Map<String, Integer> getPartyBranchMemberCount() { public Map<String, Integer> getPartyBranchMemberCount() {
Map<String, Integer> map = new HashMap<>(2); Map<String, Integer> map = new HashMap<>(2);
LambdaQueryWrapper<EventPartyBranch> queryBranch = Wrappers.lambdaQuery();
queryBranch.eq(EventPartyBranch::getType, "1").eq(EventPartyBranch::getStatus, "1");
//查询党支部数量
int branchCount = this.count(queryBranch);
LambdaQueryWrapper<EventPartyBranch> queryMember = Wrappers.lambdaQuery(); LambdaQueryWrapper<EventPartyBranch> queryMember = Wrappers.lambdaQuery();
queryMember.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1"); queryMember.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1");
List<EventPartyBranch> list = this.list(queryMember);
//查询党员总数量 //查询党员总数量
int memberCount = this.count(queryMember); int memberCount = list.size();
Map<String, List<EventPartyBranch>> listMap = list.stream().collect(Collectors.groupingBy(EventPartyBranch::getBranchCode));
int branchCount = listMap.keySet().stream().mapToInt(k -> (int) listMap.get(k).stream().map(EventPartyBranch::getBelongBranchName).distinct().count()).sum();
map.put("branch", branchCount); map.put("branch", branchCount);
map.put("member", memberCount); map.put("member", memberCount);