fix: 利润趋势更改为收入-支出

gongchunyi

7 小时以前 f70bc98067b3051c83f52325c1b24b47c06b7c67

 src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java

@@ -146,6 +146,12 @@
    @Autowired
    private ProductProcessMapper productProcessMapper;

    @Autowired
    private AccountExpenseMapper accountExpenseMapper;

    @Autowired
    private AccountIncomeMapper accountIncomeMapper;

    @Override
    public HomeBusinessDto business() {
        // 构建结果
@@ -1145,12 +1151,6 @@
        return homeMapper.productTurnoverDays();
    }

    @Autowired
    private AccountExpenseMapper accountExpenseMapper;

    @Autowired
    private AccountIncomeMapper accountIncomeMapper;

    public List<Map<String, Object>> incomeExpenseAnalysis(Integer type) {

        LocalDate today = LocalDate.now();
@@ -1274,36 +1274,21 @@
        String startStr = startDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
        String endStr = endDate.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));

        // List<IncomeExpenseAnalysisDto> incomeList =
        // salesLedgerMapper.selectIncomeStats(startStr, endStr, dateFormat);
        List<IncomeExpenseAnalysisDto> incomeList = new ArrayList<>();
        List<IncomeExpenseAnalysisDto> purchaseList = purchaseLedgerMapper.selectPurchaseStats(startStr, endStr,
                dateFormat);
        List<IncomeExpenseAnalysisDto> expenseList = accountExpenseMapper.selectAccountExpenseStats(startStr, endStr,
                dateFormat);
        List<IncomeExpenseAnalysisDto> incomeList = accountIncomeMapper.selectIncomeStats(startStr, endStr, dateFormat);
        List<IncomeExpenseAnalysisDto> expenseList = accountExpenseMapper.selectAccountExpenseStats(startStr, endStr, dateFormat);

        Map<String, BigDecimal> incomeMap = incomeList.stream().collect(Collectors
                .toMap(IncomeExpenseAnalysisDto::getDateStr, IncomeExpenseAnalysisDto::getAmount, BigDecimal::add));
        Map<String, BigDecimal> purchaseMap = purchaseList.stream().collect(Collectors
                .toMap(IncomeExpenseAnalysisDto::getDateStr, IncomeExpenseAnalysisDto::getAmount, BigDecimal::add));
        Map<String, BigDecimal> expenseMap = expenseList.stream().collect(Collectors
                .toMap(IncomeExpenseAnalysisDto::getDateStr, IncomeExpenseAnalysisDto::getAmount, BigDecimal::add));

        List<MapDto> result = new ArrayList<>();

        for (String month : months) {
            MapDto dto = new MapDto();
            dto.setName(month);

            BigDecimal income = incomeMap.getOrDefault(month, BigDecimal.ZERO);

            BigDecimal purchase = purchaseMap.getOrDefault(month, BigDecimal.ZERO);
            income = BigDecimal.ZERO;
            BigDecimal expense = expenseMap.getOrDefault(month, BigDecimal.ZERO);
            BigDecimal totalExpense = purchase.add(expense);

            BigDecimal profit = income.subtract(totalExpense);

            BigDecimal profit = income.subtract(expense);
            dto.setValue(profit.setScale(2, RoundingMode.HALF_UP).toString());
            result.add(dto);
        }