From 2439c81ef23336c119eb755db0d0d1d0fff4ada5 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 08 九月 2023 10:33:57 +0800
Subject: [PATCH] #
---
src/main/webapp/views/detail.html | 6 ------
src/main/java/com/zy/crm/manager/controller/DashboardController.java | 31 ++++++++++++++++---------------
src/main/java/com/zy/crm/system/entity/User.java | 13 -------------
src/main/webapp/views/home/dashboard.html | 2 +-
src/main/resources/mapper/UserMapper.xml | 1 -
src/main/webapp/views/order/order.html | 4 ++--
6 files changed, 19 insertions(+), 38 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..0692dcf 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 = 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);
diff --git a/src/main/java/com/zy/crm/system/entity/User.java b/src/main/java/com/zy/crm/system/entity/User.java
index fd53a51..1218904 100644
--- a/src/main/java/com/zy/crm/system/entity/User.java
+++ b/src/main/java/com/zy/crm/system/entity/User.java
@@ -92,11 +92,6 @@
*/
private Integer status;
- /**
- * 涓汉鍏ㄥ勾鐩爣
- */
- private String target;
-
public Long getId() {
return id;
}
@@ -268,13 +263,5 @@
public void setStatus(Integer status) {
this.status = status;
- }
-
- public String getTarget() {
- return target;
- }
-
- public void setTarget(String target) {
- this.target = target;
}
}
diff --git a/src/main/resources/mapper/UserMapper.xml b/src/main/resources/mapper/UserMapper.xml
index e002837..1b95192 100644
--- a/src/main/resources/mapper/UserMapper.xml
+++ b/src/main/resources/mapper/UserMapper.xml
@@ -16,7 +16,6 @@
<result column="sex" property="sex" />
<result column="create_time" property="createTime" />
<result column="status" property="status" />
- <result column="target" property="target" />
</resultMap>
diff --git a/src/main/webapp/views/detail.html b/src/main/webapp/views/detail.html
index c781f0a..ece6eb1 100644
--- a/src/main/webapp/views/detail.html
+++ b/src/main/webapp/views/detail.html
@@ -76,12 +76,6 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label">涓汉鍏ㄥ勾鐩爣</label>
- <div class="layui-input-inline">
- <input name="target" class="layui-input" type="text" placeholder="璇疯緭鍏�" autocomplete="off">
- </div>
- </div>
- <div class="layui-form-item">
<label class="layui-form-label">鑱旂郴鏂瑰紡</label>
<div class="layui-input-inline">
<input name="mobile" class="layui-input" type="text" placeholder="璇疯緭鍏�" autocomplete="off">
diff --git a/src/main/webapp/views/home/dashboard.html b/src/main/webapp/views/home/dashboard.html
index fa9efb8..a3e4eb1 100644
--- a/src/main/webapp/views/home/dashboard.html
+++ b/src/main/webapp/views/home/dashboard.html
@@ -304,7 +304,7 @@
}
div += "<td>" + data[i].username + "</td>"
- div += "<td>" + data[i].money + "</td>"
+ div += "<td>" + data[i].money + "涓囧厓</td>"
div += "</tr>"
$("#staffRankId").append(div)
diff --git a/src/main/webapp/views/order/order.html b/src/main/webapp/views/order/order.html
index 15c5573..b1132ea 100644
--- a/src/main/webapp/views/order/order.html
+++ b/src/main/webapp/views/order/order.html
@@ -170,9 +170,9 @@
</div>
</div>
<div class="layui-form-item">
- <label class="layui-form-label layui-form-required">椤圭洰棰勭畻閲戦: </label>
+ <label class="layui-form-label layui-form-required">棰勭畻閲戦(涓囧厓): </label>
<div class="layui-input-block">
- <input type="number" class="layui-input" name="money" placeholder="璇疯緭鍏ラ」鐩绠楅噾棰�" lay-vertype="tips" lay-verify="required" autocomplete="off">
+ <input type="number" class="layui-input" name="money" placeholder="璇疯緭鍏ラ绠楅噾棰�(涓囧厓)" lay-vertype="tips" lay-verify="required" autocomplete="off">
</div>
</div>
<div class="layui-form-item">
--
Gitblit v1.9.1