From 3041a7d6dba13e237c4f21d3e46b88c35d376bf3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 08 九月 2023 10:14:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/DashboardController.java | 5 +++--
1 files changed, 3 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 a47c028..891f151 100644
--- a/src/main/java/com/zy/crm/manager/controller/DashboardController.java
+++ b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
@@ -39,7 +39,7 @@
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();
}
@@ -106,10 +106,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);
--
Gitblit v1.9.1