|
@@ -124,16 +124,10 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
|
|
|
wrapper.orderByDesc("arw.transaction_time");
|
|
|
Page<AccountRunningWaterVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
|
|
|
List<AccountRunningWaterVo> records = page.getRecords();
|
|
|
- boolean flag = true;
|
|
|
for (AccountRunningWaterVo record : records) {
|
|
|
- //如果是第一条不计算余额
|
|
|
- if (!flag) {
|
|
|
- //根据当前余额 反向计算 每条记录操作后的余额 收入减 支出加
|
|
|
- remainder = "10".equals(record.getStatus()) ? remainder.subtract(record.getAmount()) : remainder.add(record.getAmount());
|
|
|
- } else {
|
|
|
- flag = false;
|
|
|
- }
|
|
|
record.setRemainder(remainder);
|
|
|
+ //根据当前余额 反向计算 每条记录操作后的余额 收入减 支出加
|
|
|
+ remainder = "10".equals(record.getStatus()) ? remainder.subtract(record.getAmount()) : remainder.add(record.getAmount());
|
|
|
}
|
|
|
//赋值归属公司名称
|
|
|
corporationService.attributeAssign(records, AccountRunningWaterVo::getCorporationId, (item, corporation) -> {
|