财务管理系统模块优化

liding

5 天以前 db628292cb9b69b901b44b146ac88c5f68e38389

 src/main/java/com/ruoyi/account/service/impl/AccountExpenseServiceImpl.java

@@ -64,9 +64,10 @@
        accountDto.setIncomeNumber(incomeNumber);
        BigDecimal totalIncome = accountIncomes.stream().map(AccountDto2::getAccount).reduce(BigDecimal.ZERO, BigDecimal::add);
        accountDto.setTotalIncome(totalIncome);
        accountIncomes.stream().forEach(accountDto2 -> {
            accountDto2.setProportion(accountDto2.getAccount().divide(totalIncome,2,BigDecimal.ROUND_HALF_UP));
        });
        accountIncomes.forEach(accountDto2 -> accountDto2.setProportion(
                totalIncome.compareTo(BigDecimal.ZERO) == 0
                        ? BigDecimal.ZERO
                        : accountDto2.getAccount().divide(totalIncome, 2, BigDecimal.ROUND_HALF_UP)));
        accountDto.setIncomeType(accountIncomes);
        //获取该段时间内的所有支出
        List<AccountDto2> accountExpenses =accountExpenseMapper.report(dateQueryDto);
@@ -76,9 +77,10 @@
        accountDto.setExpenseNumber(expenseNumber);
        BigDecimal totalExpense = accountExpenses.stream().map(AccountDto2::getAccount).reduce(BigDecimal.ZERO, BigDecimal::add);
        accountDto.setTotalExpense(totalExpense);
        accountExpenses.stream().forEach(accountDto2 -> {
            accountDto2.setProportion(accountDto2.getAccount().divide(totalExpense,2,BigDecimal.ROUND_HALF_UP));
        });
        accountExpenses.forEach(accountDto2 -> accountDto2.setProportion(
                totalExpense.compareTo(BigDecimal.ZERO) == 0
                        ? BigDecimal.ZERO
                        : accountDto2.getAccount().divide(totalExpense, 2, BigDecimal.ROUND_HALF_UP)));
        accountDto.setExpenseType(accountExpenses);
        //净收入
        BigDecimal netRevenue = totalIncome.subtract(totalExpense);
@@ -152,6 +154,14 @@
    }

    @Override
    public Map<String, Object> categoryReport(DateQueryDto dateQueryDto) {
        Map<String, Object> result = new HashMap<>();
        result.put("share", accountExpenseMapper.reportByCategory(dateQueryDto));
        result.put("trend", accountExpenseMapper.trendByCategory(dateQueryDto));
        return result;
    }

    @Override
    public AccountExpense getByInvoiceNumber(String purchaseContractNumber) {
        return accountExpenseMapper.selectOne(Wrappers.<AccountExpense>lambdaQuery()
                .eq(AccountExpense::getInvoiceNumber, purchaseContractNumber));