From 470ae430433a79c68e115fdc94fc16291f034749 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 17 十一月 2023 14:01:11 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/DashboardController.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/DashboardController.java b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
index 60a7caf..f34603e 100644
--- a/src/main/java/com/zy/crm/manager/controller/DashboardController.java
+++ b/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);
}
- User user = getUser(token);
- if (Cools.isEmpty(user) || Cools.isEmpty(user.getRoleId())){
- return R.ok(item);
- }
- if (user.getRoleId()<3){
- item="true";
+ try{
+ User user = getUser(token);
+ if (Cools.isEmpty(user) || Cools.isEmpty(user.getRoleId())){
+ return R.ok(item);
+ }
+ if (user.getRoleId()<2){
+ item="true";
+ }else if (user.getRoleId()<3){
+ item="true2";
+ }
+ }catch (Exception e){
+
}
return R.ok(item);
}
--
Gitblit v1.9.1