|
@@ -1199,8 +1199,7 @@ public class FundAccountDetailServiceImpl extends ServiceImpl<FundAccountDetailM
|
|
|
Map<String, Map<String, Map<Integer, Map<Integer, BigDecimal>>>> incomingAndOutgoingsByMonth =
|
|
|
this.getIncomingAndOutgoingsByMonth(accountIdList, beginDate, endDate);
|
|
|
|
|
|
-
|
|
|
- List<GetNewBalanceV2RewriteVo> result = accountList.stream().map(item -> {
|
|
|
+ return accountList.stream().map(item -> {
|
|
|
GetNewBalanceV2RewriteVo vo = new GetNewBalanceV2RewriteVo();
|
|
|
vo.setId(item.getId());
|
|
|
vo.setName(item.getName());
|
|
@@ -1309,8 +1308,6 @@ public class FundAccountDetailServiceImpl extends ServiceImpl<FundAccountDetailM
|
|
|
vo.setDetailList(detailList);
|
|
|
return vo;
|
|
|
}).collect(Collectors.toList());
|
|
|
-
|
|
|
- return result;
|
|
|
}
|
|
|
|
|
|
/**
|
|
@@ -1386,11 +1383,11 @@ public class FundAccountDetailServiceImpl extends ServiceImpl<FundAccountDetailM
|
|
|
.in(FundAccountDetail::getFromFundAccountId, accountIdList)
|
|
|
.between(BasicsEntity::getCreateTime, beginDate, endDate)
|
|
|
.select(FundAccountDetail::getType, FundAccountDetail::getCurrencyType,
|
|
|
- FundAccountDetail::getFromFundAccountId, FundAccountDetail::getMoney)
|
|
|
+ FundAccountDetail::getFromFundAccountId, FundAccountDetail::getMoney, BasicsEntity::getCreateTime)
|
|
|
.orderByDesc(BasicsEntity::getCreateTime)
|
|
|
);
|
|
|
|
|
|
- return list.stream().collect(Collectors.groupingBy(
|
|
|
+ Map<String, Map<String, Map<Integer, Map<Integer, BigDecimal>>>> collect = list.stream().collect(Collectors.groupingBy(
|
|
|
// 账号id分组
|
|
|
FundAccountDetail::getFromFundAccountId,
|
|
|
Collectors.groupingBy(
|
|
@@ -1411,6 +1408,8 @@ public class FundAccountDetailServiceImpl extends ServiceImpl<FundAccountDetailM
|
|
|
)
|
|
|
));
|
|
|
|
|
|
+ return collect;
|
|
|
+
|
|
|
}
|
|
|
|
|
|
}
|