From 336b1ee18a1d1ff4230e8edb7faa43e3b5ef1ffc Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 08 九月 2023 08:50:35 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/DashboardController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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 099330c..b2d1ced 100644
--- a/src/main/java/com/zy/crm/manager/controller/DashboardController.java
+++ b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
@@ -49,7 +49,7 @@
//鑾峰彇鍏ㄥ勾浜ゆ槗澶辫触閲戦
Double failedMoney = orderService.selectMoneyByYearAndStatus(year, 2);
//鍏ㄥ勾浜ゆ槗鐜�
- double yearTransactionRate = (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
+ double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
map.put("successMoney", WordUtils.formatNumberForAccounting(successMoney));//鍏ㄥ勾浜ゆ槗鎴愬姛閲戦
map.put("progressMoney", WordUtils.formatNumberForAccounting(progressMoney));//鍏ㄥ勾鏈氦鏄撴垚鍔熼噾棰�
map.put("yearTransactionRate", String.format("%.2f", yearTransactionRate));//鍏ㄥ勾浜ゆ槗鐜�
@@ -80,10 +80,18 @@
//鑾峰彇鍏ㄥ勾浜ゆ槗澶辫触閲戦
Double failedMoney = orderService.selectMoneyByUserAndYearAndStatus(user.getId(), year, 2);
//鍏ㄥ勾浜ゆ槗鐜�
- double yearTransactionRate = (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
+ double yearTransactionRate = successMoney == 0 ? successMoney : (successMoney / (successMoney + progressMoney + failedMoney)) * 100;
map.put("successMoney", WordUtils.formatNumberForAccounting(successMoney));//鍏ㄥ勾浜ゆ槗鎴愬姛閲戦
map.put("progressMoney", WordUtils.formatNumberForAccounting(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);
}
--
Gitblit v1.9.1