#

LSH

2023-11-17 470ae430433a79c68e115fdc94fc16291f034749

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

@@ -72,9 +72,15 @@
//        double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
        double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / Double.parseDouble(companyTarget.getTarget())) * 100;

        Double successMoney1 = companyMoneyService.selectMoneyReceivablesAll(null, year);

        Double successMoney2 = companyMoneyService.selectMoneyActualReceiptsAll(null, year);

        map.put("successMoney", formatter.format(successMoney));//全年交易成功金额
        map.put("progressMoney", formatter.format(progressMoney));//全年未交易成功金额
        map.put("yearTransactionRate", String.format("%.2f", yearTransactionRate));//全年交易率
        map.put("receivablesMoney", successMoney1/10000);//应收款
        map.put("actualReceiptsMoney",successMoney2/10000);//实际收款
        return R.ok().add(map);
    }

@@ -203,12 +209,18 @@
        if (Cools.isEmpty(token)){
            return R.ok(item);
        }
        try{
        User user = getUser(token);
        if (Cools.isEmpty(user) || Cools.isEmpty(user.getRoleId())){
            return R.ok(item);
        }
        if (user.getRoleId()<3){
            if (user.getRoleId()<2){
            item="true";
            }else if (user.getRoleId()<3){
                item="true2";
            }
        }catch (Exception e){

        }
        return R.ok(item);
    }