党员活动 党支部数量
This commit is contained in:
@ -161,4 +161,12 @@ public class EventPartyBranch implements Serializable {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@ApiModelProperty(value = "党员数量")
|
@ApiModelProperty(value = "党员数量")
|
||||||
private Integer count;
|
private Integer count;
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 党支部数量
|
||||||
|
*/
|
||||||
|
@TableField(exist = false)
|
||||||
|
@ApiModelProperty(value = "党支部数量")
|
||||||
|
private Integer branchCount;
|
||||||
}
|
}
|
||||||
|
@ -41,10 +41,12 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
|
|||||||
Map<String, Integer> map = new HashMap<>(2);
|
Map<String, Integer> map = new HashMap<>(2);
|
||||||
LambdaQueryWrapper<EventPartyBranch> queryBranch = Wrappers.lambdaQuery();
|
LambdaQueryWrapper<EventPartyBranch> queryBranch = Wrappers.lambdaQuery();
|
||||||
queryBranch.eq(EventPartyBranch::getType, "1").eq(EventPartyBranch::getStatus, "1");
|
queryBranch.eq(EventPartyBranch::getType, "1").eq(EventPartyBranch::getStatus, "1");
|
||||||
|
//查询党支部数量
|
||||||
int branchCount = this.count(queryBranch);
|
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");
|
||||||
|
//查询党员总数量
|
||||||
int memberCount = this.count(queryMember);
|
int memberCount = this.count(queryMember);
|
||||||
|
|
||||||
map.put("branch", branchCount);
|
map.put("branch", branchCount);
|
||||||
@ -57,14 +59,26 @@ public class EventPartyBranchServiceImpl extends ServiceImpl<EventPartyBranchMap
|
|||||||
public List<EventPartyBranch> getPartyBranchList() {
|
public List<EventPartyBranch> getPartyBranchList() {
|
||||||
LambdaQueryWrapper<EventPartyBranch> queryBranch = Wrappers.lambdaQuery();
|
LambdaQueryWrapper<EventPartyBranch> queryBranch = Wrappers.lambdaQuery();
|
||||||
queryBranch.eq(EventPartyBranch::getType, "1").eq(EventPartyBranch::getStatus, "1");
|
queryBranch.eq(EventPartyBranch::getType, "1").eq(EventPartyBranch::getStatus, "1");
|
||||||
|
//查询党支部数量
|
||||||
List<EventPartyBranch> list = this.list(queryBranch);
|
List<EventPartyBranch> list = this.list(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> memberList = this.list(queryMember);
|
List<EventPartyBranch> memberList = this.list(queryMember);
|
||||||
Map<String, List<EventPartyBranch>> listMap = memberList.stream().collect(Collectors.groupingBy(EventPartyBranch::getBelongBranch));
|
//根据所属省分组
|
||||||
|
Map<String, List<EventPartyBranch>> listMap = memberList.stream().collect(Collectors.groupingBy(EventPartyBranch::getBranchCode));
|
||||||
list.forEach(f -> f.setCount(listMap.get(f.getId()) == null ? 0 : listMap.get(f.getId()).size()));
|
//每个省党员数量
|
||||||
|
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());
|
return list.stream().sorted(Comparator.comparing(EventPartyBranch::getSort)).collect(Collectors.toList());
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user