qdintc/intc-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 账户总览bug修复。

Browse Source
This commit is contained in:
tianyongbao
2024-05-06 16:30:53 +08:00
parent 7e4c84edbf
commit b3679413b4
1 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java
View File

@@ -1596,25 +1596,66 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService {
List<AccountsDealRecordVo> accountsDealRecordVoList=accountsDealRecordMapper.selectAccountsDealRecordList(dto); List<AccountsDealRecordVo> accountsDealRecordVoList=accountsDealRecordMapper.selectAccountsDealRecordList(dto);
double income =0; double income =0;
double expenses =0; double expenses =0;
double posExpenses =0;
double realExpenses =0;
double posIncome=0;
int incomeCount =0; int incomeCount =0;
int posIncomeCount =0;
int expensesCount =0; int expensesCount =0;
int posExpensesCount =0;
int realExpensesCount =0;
for (AccountsDealRecordVo vo:accountsDealRecordVoList for (AccountsDealRecordVo vo:accountsDealRecordVoList
) { ) {
if(vo.getDealType().equals("1")){ if(vo.getDealType().equals("1")){
income+=vo.getAmount(); income+=vo.getAmount();
incomeCount++; incomeCount++;
if(vo.getDealCategory().equals("5")){
posIncome+=vo.getAmount();
posIncomeCount++;
}
} }
//支出 //支出
if(vo.getDealType().equals("2")){ if(vo.getDealType().equals("2")){
expenses+=vo.getAmount(); expenses+=vo.getAmount();
expensesCount++; expensesCount++;
if(vo.getDealCategory().equals("5")){
posExpenses+=vo.getAmount();
posExpensesCount++;
}
if(vo.getDealCategory().equals("1")){
realExpenses+=vo.getAmount();
realExpensesCount++;
} }
} }
}
//交易金额
map.put("amount",decimalFormat.format(income-expenses)); map.put("amount",decimalFormat.format(income-expenses));
//收入
map.put("income",decimalFormat.format(income)); map.put("income",decimalFormat.format(income));
//pos收入
map.put("posIncome",decimalFormat.format(posIncome-posExpenses));
//非pos收入
map.put("notPosIncome",decimalFormat.format(income-posIncome-posExpenses));
//支出
map.put("expenses",decimalFormat.format(expenses)); map.put("expenses",decimalFormat.format(expenses));
//pos支出
map.put("posExpenses",decimalFormat.format(posExpenses));
//真实消费
map.put("realExpenses",decimalFormat.format(realExpenses));
//收入笔数
map.put("incomeCount",incomeCount); map.put("incomeCount",incomeCount);
//pos收入笔数
map.put("posIncomeCount",posIncomeCount);
//非pos收入笔数
map.put("notPosIncomeCount",incomeCount-posIncomeCount);
//支出笔数
map.put("expensesCount",expensesCount); map.put("expensesCount",expensesCount);
//pos支出笔数
map.put("posExpensesCount",posExpensesCount);
//日常支出消费笔数
map.put("realExpensesCount",realExpensesCount);
//其他支出笔数
map.put("otherExpensesCount",expensesCount-posExpensesCount-realExpensesCount);
List<AccountsDealRecordVo> queryList =new ArrayList<>(); List<AccountsDealRecordVo> queryList =new ArrayList<>();
if("1".equals(analysisDto.getType())){ if("1".equals(analysisDto.getType())){