BD 列表回退
This commit is contained in:
parent
814b6fdf76
commit
c0def6600f
@ -116,8 +116,8 @@ public class BdTeamQryExe {
|
|||||||
overview.setTeamTotalIncome(teamTotal);
|
overview.setTeamTotalIncome(teamTotal);
|
||||||
|
|
||||||
// TODO: 查询当前用户的收入汇总(从历史结算记录查询)
|
// TODO: 查询当前用户的收入汇总(从历史结算记录查询)
|
||||||
overview.setTotalIncome(BigDecimal.valueOf(1000));
|
overview.setTotalIncome(teamTotal);
|
||||||
overview.setPreviousPeriodIncome(BigDecimal.valueOf(1000));
|
overview.setPreviousPeriodIncome(BigDecimal.valueOf(0));
|
||||||
|
|
||||||
return overview;
|
return overview;
|
||||||
}
|
}
|
||||||
@ -178,16 +178,6 @@ public class BdTeamQryExe {
|
|||||||
return Collections.emptyList();
|
return Collections.emptyList();
|
||||||
}
|
}
|
||||||
|
|
||||||
Set<Long> bdIdSet = bdList.stream().map(BusinessDevelopmentBaseInfo::getUserId)
|
|
||||||
.filter(e -> !e.equals(bdLeaderUserId))
|
|
||||||
.collect(Collectors.toSet());
|
|
||||||
List<RoomBdLead> roomBdLeads = roomBdLeadService.listByUserIds(bdIdSet);
|
|
||||||
|
|
||||||
List<Long> bdLeaderIdList = roomBdLeads.stream().map(RoomBdLead::getUserId).toList();
|
|
||||||
bdList = bdList.stream()
|
|
||||||
.filter(e -> !bdLeaderIdList.contains(e.getUserId()))
|
|
||||||
.toList();
|
|
||||||
|
|
||||||
Set<Long> bdUserIdSet = bdList.stream()
|
Set<Long> bdUserIdSet = bdList.stream()
|
||||||
.map(BusinessDevelopmentBaseInfo::getUserId)
|
.map(BusinessDevelopmentBaseInfo::getUserId)
|
||||||
.collect(Collectors.toSet());
|
.collect(Collectors.toSet());
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user