#核价管理完善

LSH

2023-09-12 a25d3c16f9f9be1a1b4774402d1907a28dab06fb

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

@@ -7,12 +7,13 @@
import com.zy.crm.manager.entity.Order;
import com.zy.crm.manager.service.CompanyTargetService;
import com.zy.crm.manager.service.OrderService;
import com.zy.crm.manager.utils.WordUtils;
import com.zy.crm.system.entity.User;
import org.springframework.beans.factory.annotation.Autowired;
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,14 +34,15 @@
    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);
        CompanyTarget companyTarget = companyTargetService.selectByYear(year);//获取公司全年目标数据
        CompanyTarget companyTarget = companyTargetService.selectCompanyByYear(year);//获取公司全年目标数据
        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);
@@ -48,10 +50,12 @@
        Double progressMoney = orderService.selectMoneyByYearAndStatus(year, 0);
        //获取全年交易失败金额
        Double failedMoney = orderService.selectMoneyByYearAndStatus(year, 2);
        //全年交易率
        double yearTransactionRate = successMoney == 0 ? successMoney : (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;
        double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / Double.parseDouble(companyTarget.getTarget())) * 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,33 +66,36 @@
    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";//获取个人全年目标数据
        if (user.getTarget() != null) {
            yearTarget = WordUtils.formatNumberForAccounting(Double.parseDouble(user.getTarget()));;
        Double yearTarget = 0D;//获取个人全年目标数据
        CompanyTarget person = companyTargetService.selectPersonByYear(year, getUserId());
        if (person != null) {
            yearTarget = Double.parseDouble(person.getTarget());
        }
        map.put("yearTarget", yearTarget);//全年交易目标
        map.put("yearTarget", formatter.format(yearTarget));//全年交易目标

        //获取全年交易成功金额
        Double successMoney = orderService.selectMoneyByUserAndYearAndStatus(user.getId(), year, 1);
        Double successMoney = orderService.selectMoneyByUserAndYearAndStatus(getUserId(), year, 1);
        //获取全年未交易成功金额
        Double progressMoney = orderService.selectMoneyByUserAndYearAndStatus(user.getId(), year, 0);
        Double progressMoney = orderService.selectMoneyByUserAndYearAndStatus(getUserId(), year, 0);
        //获取全年交易失败金额
        Double failedMoney = orderService.selectMoneyByUserAndYearAndStatus(user.getId(), year, 2);
        //全年交易率
        double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
        map.put("successMoney", WordUtils.formatNumberForAccounting(successMoney));//全年交易成功金额
        map.put("progressMoney", WordUtils.formatNumberForAccounting(progressMoney));//全年未交易成功金额
        Double failedMoney = orderService.selectMoneyByUserAndYearAndStatus(getUserId(), year, 2);
        //全年完成率
//        double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
        double yearTransactionRate = yearTarget==0? 0 : successMoney == 0 ? successMoney : (successMoney / yearTarget) * 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 progressCount = orderService.selectCountByUserYearAndStatus(getUserId(), year, 0);
        //获取全年成交数量
        Integer successCount = orderService.selectCountByUserYearAndStatus(user.getId(), year, 1);
        Integer successCount = orderService.selectCountByUserYearAndStatus(getUserId(), year, 1);
        map.put("progressCount", progressCount);
        map.put("successCount", successCount);

@@ -100,10 +107,11 @@
    @ManagerAuth
    public R getStaffRank() {
        ArrayList<HashMap<String, Object>> list = new ArrayList<>();
        NumberFormat formatter = new DecimalFormat("#,###");
        for (Order order : orderService.selectTopMoney()) {
            HashMap<String, Object> map = new HashMap<>();
            map.put("username", order.getUserId$());
            map.put("money", WordUtils.formatNumberForAccounting(order.getMoney()));
            map.put("money", formatter.format(order.getMoney()));
            list.add(map);
        }
        return R.ok().add(list);