diff --git a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java index f3bc938..7036a8d 100644 --- a/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java +++ b/ruoyi-modules/intc-invest/src/main/java/com/ruoyi/invest/service/impl/StatisticAnalysisImpl.java @@ -1596,25 +1596,66 @@ public class StatisticAnalysisImpl implements IStatisticAnalysisService { List accountsDealRecordVoList=accountsDealRecordMapper.selectAccountsDealRecordList(dto); double income =0; double expenses =0; + double posExpenses =0; + double realExpenses =0; + double posIncome=0; int incomeCount =0; + int posIncomeCount =0; int expensesCount =0; + int posExpensesCount =0; + int realExpensesCount =0; for (AccountsDealRecordVo vo:accountsDealRecordVoList ) { if(vo.getDealType().equals("1")){ income+=vo.getAmount(); incomeCount++; + if(vo.getDealCategory().equals("5")){ + posIncome+=vo.getAmount(); + posIncomeCount++; + } } //支出 if(vo.getDealType().equals("2")){ expenses+=vo.getAmount(); 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("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)); + //pos支出 + map.put("posExpenses",decimalFormat.format(posExpenses)); + //真实消费 + map.put("realExpenses",decimalFormat.format(realExpenses)); + //收入笔数 map.put("incomeCount",incomeCount); + //pos收入笔数 + map.put("posIncomeCount",posIncomeCount); + //非pos收入笔数 + map.put("notPosIncomeCount",incomeCount-posIncomeCount); + //支出笔数 map.put("expensesCount",expensesCount); + //pos支出笔数 + map.put("posExpensesCount",posExpensesCount); + //日常支出消费笔数 + map.put("realExpensesCount",realExpensesCount); + //其他支出笔数 + map.put("otherExpensesCount",expensesCount-posExpensesCount-realExpensesCount); List queryList =new ArrayList<>(); if("1".equals(analysisDto.getType())){