diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/BdTeamSummaryQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/BdTeamSummaryQryExe.java index 570a0998..36061f55 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/BdTeamSummaryQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/BdTeamSummaryQryExe.java @@ -205,8 +205,7 @@ public class BdTeamSummaryQryExe { .collect(Collectors.toSet()); // 查询账单数据 - Map billCycleMap = teamBillCycleService.mapByTeamIds2( - teamIdSet, currentBillBelong, TeamBillCycleStatus.UNPAID); + Map billCycleMap = teamBillCycleService.mapByTeamIds(teamIdSet, currentBillBelong); Map> memberTargetMap = teamMemberTargetService.mapMemberBillTarget(teamIdSet, currentBillBelong); @@ -239,8 +238,7 @@ public class BdTeamSummaryQryExe { .collect(Collectors.toSet()); // 2. 查询账单周期 - Map billCycleMap = teamBillCycleService.mapByTeamIds2( - teamIdSet, currentBillBelong, TeamBillCycleStatus.UNPAID); + Map billCycleMap = teamBillCycleService.mapByTeamIds(teamIdSet, currentBillBelong); // 3. 查询成员目标 Map> memberTargetMap = diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/TeamBillCycleService.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/TeamBillCycleService.java index 6e64441f..626c3a9a 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/TeamBillCycleService.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/TeamBillCycleService.java @@ -27,6 +27,11 @@ public interface TeamBillCycleService { */ Map mapByTeamIds2(Set teamIds, Integer billBelong, TeamBillCycleStatus status); + /** + * 获取一组账单信息. + */ + Map mapByTeamIds(Set teamIds, Integer billBelong); + /** * 获取一组账单信息. */ diff --git a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/impl/TeamBillCycleServiceImpl.java b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/impl/TeamBillCycleServiceImpl.java index 2f876953..784d7b38 100644 --- a/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/impl/TeamBillCycleServiceImpl.java +++ b/rc-service/rc-service-other/other-infrastructure/src/main/java/com/red/circle/other/infra/database/mongo/service/team/team/impl/TeamBillCycleServiceImpl.java @@ -159,6 +159,24 @@ public class TeamBillCycleServiceImpl implements TeamBillCycleService { )); } + @Override + public Map mapByTeamIds(Set teamIds, Integer billBelong) { + if (CollectionUtils.isEmpty(teamIds) || billBelong == null) { + return Maps.newHashMap(); + } + + List teamBillCycles = mongoTemplate.find( + Query.query(Criteria.where("teamId").in(teamIds) + .and("billBelong").is(billBelong) + ), + TeamBillCycle.class); + if (CollectionUtils.isEmpty(teamBillCycles)) { + return Maps.newHashMap(); + } + return teamBillCycles.stream() + .collect(Collectors.toMap(TeamBillCycle::getTeamId, v -> v, (v1, v2) -> v1)); + } + @Override public Map mapByBillIds(Set teamIds, Set billBelongs) { if (CollectionUtils.isEmpty(teamIds) || CollectionUtils.isEmpty(billBelongs)) {