From a25d3c16f9f9be1a1b4774402d1907a28dab06fb Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期二, 12 九月 2023 09:43:55 +0800
Subject: [PATCH] #核价管理完善
---
src/main/java/com/zy/crm/manager/controller/DashboardController.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 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 891f151..1202412 100644
--- a/src/main/java/com/zy/crm/manager/controller/DashboardController.java
+++ b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
@@ -7,7 +7,6 @@
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;
@@ -51,8 +50,9 @@
Double progressMoney = orderService.selectMoneyByYearAndStatus(year, 0);
//鑾峰彇鍏ㄥ勾浜ゆ槗澶辫触閲戦
Double failedMoney = orderService.selectMoneyByYearAndStatus(year, 2);
- //鍏ㄥ勾浜ゆ槗鐜�
- double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
+ //鍏ㄥ勾瀹屾垚鐜�
+// 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));//鍏ㄥ勾鏈氦鏄撴垚鍔熼噾棰�
@@ -71,30 +71,31 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy");
String year = format.format(date);
- User user = getUser();
- String yearTarget = "0";//鑾峰彇涓汉鍏ㄥ勾鐩爣鏁版嵁
- if (user.getTarget() != null) {
- yearTarget = formatter.format(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;
+ 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);
--
Gitblit v1.9.1