diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java index 92d9092..3ce0bce 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java @@ -44,15 +44,16 @@ public class EventPartyBranchServiceImpl extends ServiceImpl getPartyBranchMemberCount() { Map map = new HashMap<>(2); - LambdaQueryWrapper queryBranch = Wrappers.lambdaQuery(); - queryBranch.eq(EventPartyBranch::getType, "1").eq(EventPartyBranch::getStatus, "1"); - //查询党支部数量 - int branchCount = this.count(queryBranch); LambdaQueryWrapper queryMember = Wrappers.lambdaQuery(); queryMember.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1"); + List list = this.list(queryMember); //查询党员总数量 - int memberCount = this.count(queryMember); + int memberCount = list.size(); + + + Map> 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("member", memberCount);