#

Junjie

2023-09-08 336b1ee18a1d1ff4230e8edb7faa43e3b5ef1ffc

 src/main/java/com/zy/crm/manager/controller/DashboardController.java

@@ -49,7 +49,7 @@
        //获取全年交易失败金额
        Double failedMoney = orderService.selectMoneyByYearAndStatus(year, 2);
        //全年交易率
        double yearTransactionRate = (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
        double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
        map.put("successMoney", WordUtils.formatNumberForAccounting(successMoney));//全年交易成功金额
        map.put("progressMoney", WordUtils.formatNumberForAccounting(progressMoney));//全年未交易成功金额
        map.put("yearTransactionRate", String.format("%.2f", yearTransactionRate));//全年交易率
@@ -80,10 +80,18 @@
        //获取全年交易失败金额
        Double failedMoney = orderService.selectMoneyByUserAndYearAndStatus(user.getId(), year, 2);
        //全年交易率
        double yearTransactionRate = (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
        double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
        map.put("successMoney", WordUtils.formatNumberForAccounting(successMoney));//全年交易成功金额
        map.put("progressMoney", WordUtils.formatNumberForAccounting(progressMoney));//全年未交易成功金额
        map.put("yearTransactionRate", String.format("%.2f", yearTransactionRate));//全年交易率

        //获取全年跟踪数量
        Integer progressCount = orderService.selectCountByUserYearAndStatus(user.getId(), year, 0);
        //获取全年成交数量
        Integer successCount = orderService.selectCountByUserYearAndStatus(user.getId(), year, 1);
        map.put("progressCount", progressCount);
        map.put("successCount", successCount);

        return R.ok().add(map);
    }