From f83498bedeca1b8824503a46ca3638b52300c95f Mon Sep 17 00:00:00 2001 From: liuh Date: Wed, 29 Jun 2022 18:58:06 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventPartyBranchServiceImpl.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) 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 e1a7dab..247dfe9 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 @@ -41,15 +41,13 @@ 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(); + int branchCount = (int) list.stream().map(EventPartyBranch::getBelongBranchName).distinct().count(); map.put("branch", branchCount); map.put("member", memberCount); From f6fa92768b7117fceb1c414508582d2d0d77ae45 Mon Sep 17 00:00:00 2001 From: liuh Date: Wed, 29 Jun 2022 19:32:06 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E6=95=B0?= =?UTF-8?q?=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/EventPartyBranchServiceImpl.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 247dfe9..bcd3d7f 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 @@ -47,7 +47,10 @@ public class EventPartyBranchServiceImpl extends ServiceImpl list = this.list(queryMember); //查询党员总数量 int memberCount = list.size(); - int branchCount = (int) list.stream().map(EventPartyBranch::getBelongBranchName).distinct().count(); + + + 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);