diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/BdTeamMemberDetailQryExe.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/BdTeamMemberDetailQryExe.java index 610194a6..50fd41e4 100644 --- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/BdTeamMemberDetailQryExe.java +++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/command/bd/query/BdTeamMemberDetailQryExe.java @@ -231,7 +231,7 @@ public class BdTeamMemberDetailQryExe { incomeDetail.setSettlementPeriod(dates[0] + "-" + dates[1]); // 判断状态 - incomeDetail.setStatus(TeamBillCycleStatus.SETTLED == teamBillCycle.getStatus() ? "Completed" : "In Progress"); + incomeDetail.setStatus(TeamBillCycleStatus.UNPAID == teamBillCycle.getStatus() ? "In Progress" : "Completed"); if (CollectionUtils.isEmpty(teamMemberTargets)) { incomeDetail.setMemberCount(0); @@ -303,7 +303,7 @@ public class BdTeamMemberDetailQryExe { // 判断状态 if (!billsInPeriod.isEmpty()) { - incomeDetail.setStatus(TeamBillCycleStatus.SETTLED == billsInPeriod.get(0).getStatus() ? "Completed" : "In Progress"); + incomeDetail.setStatus(TeamBillCycleStatus.UNPAID == billsInPeriod.get(0).getStatus() ? "In Progress" : "Completed"); } // 汇总所有team的收入