|
|
@@ -972,7 +972,7 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
|
|
|
orderVoPage.setTotal(total);
|
|
|
|
|
|
sumAmountSR=sysUserAccountHistoryService.findSumAmount(myIncomeAndExpensesQueryDto);
|
|
|
- sumAmountZC=sysUserAccountHistoryService.findSumAmountByUserId(myIncomeAndExpensesQueryDto.getUserId(),"2");
|
|
|
+ sumAmountZC=sysUserAccountHistoryService.findSumAmountByUserId(myIncomeAndExpensesQueryDto.getUserId(),"1");
|
|
|
List<MyCollectInAdvanceDto> recordsNew =new ArrayList<>();
|
|
|
if(orderVoPage.getRecords()!=null && orderVoPage.getRecords().size()>0){
|
|
|
for(MyCollectInAdvanceDto dto :orderVoPage.getRecords()){
|
|
|
@@ -1010,7 +1010,8 @@ public class SysUserAccountServiceImpl extends ServiceImpl<SysUserAccountMapper,
|
|
|
myCollectInAdvanceDtoBasePageResult=new BasePageResult<>(myIncomeAndExpensesQueryDto.getPageNum(), myIncomeAndExpensesQueryDto.getPageSize(), orderVoPage.getTotal(),
|
|
|
orderVoPage.getPages()
|
|
|
, orderVoPage.getRecords());
|
|
|
- sumAmountSR=sysUserAccountHistoryService.findSumAmountByUserId(myIncomeAndExpensesQueryDto.getUserId(),"1");
|
|
|
+ sumAmountSR=sysUserAccountHistoryService.findSumAmountByUserId(myIncomeAndExpensesQueryDto.getUserId(),"2");
|
|
|
+ sumAmountZC=sysUserAccountHistoryService.findSumAmount(myIncomeAndExpensesQueryDto);
|
|
|
}
|
|
|
|
|
|
} else {
|