From 4add218bea836df2dffdcf6127a041d7975bbde0 Mon Sep 17 00:00:00 2001 From: "517612449@qq.com" Date: Tue, 28 Jun 2022 10:05:07 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E6=B4=BB=E5=8A=A8=20?= =?UTF-8?q?=E5=85=9A=E6=94=AF=E9=83=A8=E6=95=B0=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../entity/EventPartyBranch.java | 8 ++++++++ .../impl/EventPartyBranchServiceImpl.java | 20 ++++++++++++++++--- 2 files changed, 25 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java index fbd9fb6..97c63c8 100644 --- a/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java +++ b/src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java @@ -161,4 +161,12 @@ public class EventPartyBranch implements Serializable { @TableField(exist = false) @ApiModelProperty(value = "党员数量") private Integer count; + + + /** + * 党支部数量 + */ + @TableField(exist = false) + @ApiModelProperty(value = "党支部数量") + private Integer branchCount; } 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 a5e0fa5..531efeb 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,10 +41,12 @@ public class EventPartyBranchServiceImpl extends ServiceImpl 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"); + //查询党员总数量 int memberCount = this.count(queryMember); map.put("branch", branchCount); @@ -57,14 +59,26 @@ public class EventPartyBranchServiceImpl extends ServiceImpl getPartyBranchList() { LambdaQueryWrapper queryBranch = Wrappers.lambdaQuery(); queryBranch.eq(EventPartyBranch::getType, "1").eq(EventPartyBranch::getStatus, "1"); + //查询党支部数量 List list = this.list(queryBranch); LambdaQueryWrapper queryMember = Wrappers.lambdaQuery(); queryMember.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1"); + //查询党员总数 List memberList = this.list(queryMember); - Map> listMap = memberList.stream().collect(Collectors.groupingBy(EventPartyBranch::getBelongBranch)); - - list.forEach(f -> f.setCount(listMap.get(f.getId()) == null ? 0 : listMap.get(f.getId()).size())); + //根据所属省分组 + Map> listMap = memberList.stream().collect(Collectors.groupingBy(EventPartyBranch::getBranchCode)); + //每个省党员数量 + list.forEach(f -> { + List memberBranchList = listMap.get(f.getId()); + if (memberBranchList == null) { + f.setCount(0); + f.setBranchCount(0); + } else { + f.setCount(memberBranchList.size()); + f.setBranchCount((int) memberBranchList.stream().map(EventPartyBranch::getBelongBranchName).count()); + } + }); return list.stream().sorted(Comparator.comparing(EventPartyBranch::getSort)).collect(Collectors.toList()); }