#

Junjie

2023-09-08 f57e1cf99a1516983d75a2522fd9f0ff3c56b65a

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

@@ -13,6 +13,8 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.text.DecimalFormat;
import java.text.NumberFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Date;
@@ -33,6 +35,7 @@
    public R getCompanyData() {
        HashMap<String, Object> map = new HashMap<>();

        NumberFormat formatter = new DecimalFormat("#,###");
        Date date = new Date();
        SimpleDateFormat format = new SimpleDateFormat("yyyy");
        String year = format.format(date);
@@ -40,7 +43,7 @@
        if (companyTarget == null) {
            return R.error();
        }
        map.put("yearTarget", companyTarget.getTarget$());//全年交易目标
        map.put("yearTarget", formatter.format(Double.parseDouble(companyTarget.getTarget())));//全年交易目标

        //获取全年交易成功金额
        Double successMoney = orderService.selectMoneyByYearAndStatus(year, 1);
@@ -49,9 +52,10 @@
        //获取全年交易失败金额
        Double failedMoney = orderService.selectMoneyByYearAndStatus(year, 2);
        //全年交易率
        double yearTransactionRate = (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
        map.put("successMoney", WordUtils.formatNumberForAccounting(successMoney));//全年交易成功金额
        map.put("progressMoney", WordUtils.formatNumberForAccounting(progressMoney));//全年未交易成功金额
        double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;

        map.put("successMoney", formatter.format(successMoney));//全年交易成功金额
        map.put("progressMoney", formatter.format(progressMoney));//全年未交易成功金额
        map.put("yearTransactionRate", String.format("%.2f", yearTransactionRate));//全年交易率
        return R.ok().add(map);
    }
@@ -62,14 +66,15 @@
    public R getPersonData() {
        HashMap<String, Object> map = new HashMap<>();

        NumberFormat formatter = new DecimalFormat("#,###");
        Date date = new Date();
        SimpleDateFormat format = new SimpleDateFormat("yyyy");
        String year = format.format(date);

        User user = getUser();
        String yearTarget = "0.00";//获取个人全年目标数据
        String yearTarget = "0";//获取个人全年目标数据
        if (user.getTarget() != null) {
            yearTarget = WordUtils.formatNumberForAccounting(Double.parseDouble(user.getTarget()));;
            yearTarget = formatter.format(Double.parseDouble(user.getTarget()));
        }
        map.put("yearTarget", yearTarget);//全年交易目标

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

        map.put("successMoney", formatter.format(successMoney));//全年交易成功金额
        map.put("progressMoney", formatter.format(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);
    }