bd more 记录状态处理
This commit is contained in:
parent
2f54f9a29b
commit
2a6730dc24
@ -231,7 +231,7 @@ public class BdTeamMemberDetailQryExe {
|
|||||||
incomeDetail.setSettlementPeriod(dates[0] + "-" + dates[1]);
|
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)) {
|
if (CollectionUtils.isEmpty(teamMemberTargets)) {
|
||||||
incomeDetail.setMemberCount(0);
|
incomeDetail.setMemberCount(0);
|
||||||
@ -303,7 +303,7 @@ public class BdTeamMemberDetailQryExe {
|
|||||||
|
|
||||||
// 判断状态
|
// 判断状态
|
||||||
if (!billsInPeriod.isEmpty()) {
|
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的收入
|
// 汇总所有team的收入
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user