liuc/biz_service_ebtp_extend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uat_partyMemberEvent' into uat_code

Browse Source
This commit is contained in:
517612449@qq.com
2022-06-28 10:10:18 +08:00
parent c3d3efdf89 4add218bea
commit 776d161836
2 changed files with 25 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/entity/EventPartyBranch.java
View File

@ -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;
}

20
src/main/java/com/chinaunicom/mall/ebtp/extend/partyMemberEvent/service/impl/EventPartyBranchServiceImpl.java
View File

@ -41,10 +41,12 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
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();
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<EventPartyBranchMap
public List<EventPartyBranch> getPartyBranchList() {
LambdaQueryWrapper<EventPartyBranch> queryBranch = Wrappers.lambdaQuery();
queryBranch.eq(EventPartyBranch::getType, "1").eq(EventPartyBranch::getStatus, "1");
//查询党支部数量
List<EventPartyBranch> list = this.list(queryBranch);
LambdaQueryWrapper<EventPartyBranch> queryMember = Wrappers.lambdaQuery();
queryMember.eq(EventPartyBranch::getType, "2").eq(EventPartyBranch::getStatus, "1");
//查询党员总数
List<EventPartyBranch> memberList = this.list(queryMember);
Map<String, List<EventPartyBranch>> 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<String, List<EventPartyBranch>> listMap = memberList.stream().collect(Collectors.groupingBy(EventPartyBranch::getBranchCode));
//每个省党员数量
list.forEach(f -> {
List<EventPartyBranch> 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());
}