From 86dc7d83fd8672c804edac3c93f71d8adc754af3 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期四, 07 九月 2023 17:17:27 +0800
Subject: [PATCH] #
---
src/main/resources/mapper/OrderMapper.xml | 7 +++
src/main/java/com/zy/crm/manager/controller/DashboardController.java | 8 ++++
src/main/java/com/zy/crm/manager/mapper/OrderMapper.java | 2 +
src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java | 5 ++
src/main/java/com/zy/crm/manager/service/OrderService.java | 2 +
src/main/webapp/views/home/dashboard.html | 60 ++++++++++++++++++++++-------
6 files changed, 69 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 ffecb50..b2d1ced 100644
--- a/src/main/java/com/zy/crm/manager/controller/DashboardController.java
+++ b/src/main/java/com/zy/crm/manager/controller/DashboardController.java
@@ -84,6 +84,14 @@
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);
}
diff --git a/src/main/java/com/zy/crm/manager/mapper/OrderMapper.java b/src/main/java/com/zy/crm/manager/mapper/OrderMapper.java
index 489b728..c6c46df 100644
--- a/src/main/java/com/zy/crm/manager/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/crm/manager/mapper/OrderMapper.java
@@ -24,6 +24,8 @@
Double selectMoneyByUserAndYearAndStatus(Long userId, String year, Integer status);//鑾峰彇鎸囧畾鐢ㄦ埛銆佸勾浠藉拰璁㈠崟鐘舵�佹�讳氦鏄撻噾棰�
+ Integer selectCountByUserYearAndStatus(Long userId, String year, Integer status);//鑾峰彇鎸囧畾骞翠唤鍜岃鍗曠姸鎬佹�绘暟閲�
+
List<Order> selectTopMoney();//鏌ヨ浜ゆ槗棰濆墠7鍚嶅憳宸�
List<HashMap<String, Object>> selectCurrentYearMonthSuccess();//鑾峰彇褰撳墠骞村害12涓湀鐨勪氦鏄撴垚鍔熼噾棰濇暟鎹�
diff --git a/src/main/java/com/zy/crm/manager/service/OrderService.java b/src/main/java/com/zy/crm/manager/service/OrderService.java
index a1c20f8..f85e809 100644
--- a/src/main/java/com/zy/crm/manager/service/OrderService.java
+++ b/src/main/java/com/zy/crm/manager/service/OrderService.java
@@ -20,6 +20,8 @@
Double selectMoneyByUserAndYearAndStatus(Long userId, String year, Integer status);//鑾峰彇鎸囧畾鐢ㄦ埛銆佸勾浠藉拰璁㈠崟鐘舵�佹�讳氦鏄撻噾棰�
+ Integer selectCountByUserYearAndStatus(Long userId, String year, Integer status);//鑾峰彇鎸囧畾骞翠唤鍜岃鍗曠姸鎬佹�绘暟閲�
+
List<Order> selectTopMoney();//鏌ヨ浜ゆ槗棰濆墠7鍚嶅憳宸�
List<Double> selectCurrentYearMonthSuccess();//鑾峰彇褰撳墠骞村害12涓湀鐨勪氦鏄撴垚鍔熼噾棰濇暟鎹�
diff --git a/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
index 149c7f9..986cb26 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/OrderServiceImpl.java
@@ -81,6 +81,11 @@
}
@Override
+ public Integer selectCountByUserYearAndStatus(Long userId, String year, Integer status) {
+ return this.baseMapper.selectCountByUserYearAndStatus(userId, year, status);
+ }
+
+ @Override
public List<Order> selectTopMoney() {
return this.baseMapper.selectTopMoney();
}
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index 0349cbd..2193d95 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -115,6 +115,13 @@
and user_id = #{userId}
</select>
+ <select id="selectCountByUserYearAndStatus" resultType="java.lang.Integer">
+ select count(*) num from man_order
+ where year(create_time) = #{year}
+ and status = #{status}
+ and user_id = #{userId}
+ </select>
+
<select id="selectTopMoney" resultMap="BaseResultMap">
select top 7 user_id,sum(money) money from man_order
where status = 1
diff --git a/src/main/webapp/views/home/dashboard.html b/src/main/webapp/views/home/dashboard.html
index 9c8d6e5..6838a39 100644
--- a/src/main/webapp/views/home/dashboard.html
+++ b/src/main/webapp/views/home/dashboard.html
@@ -50,51 +50,77 @@
<div class="layui-row">
<div>鍥㈤槦鏁版嵁</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">鍏ㄥ勾鐩爣</div>
+ <div class="numberInfoSubTitle">骞村害閿�鍞洰鏍�</div>
<div class="numberInfoValue">
- <span id="companyYearTarget">124,543,233</span><em class="numberInfoSuffix">鍏�</em>
+ <span id="companyYearTarget">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">宸插畬鎴愪氦鏄�</div>
+ <div class="numberInfoSubTitle">宸插畬鎴愰攢鍞换鍔�</div>
<div class="numberInfoValue">
- <span id="companySuccess">124,543,233</span><em class="numberInfoSuffix">鍏�</em>
+ <span id="companySuccess">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">鏈畬鎴愪氦鏄�</div>
+ <div class="numberInfoSubTitle">鏈畬鎴愰攢鍞换鍔�</div>
<div class="numberInfoValue">
- <span id="companyProgress">124,543,233</span><em class="numberInfoSuffix">鍏�</em>
+ <span id="companyProgress">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">浜ゆ槗鐜�</div>
+ <div class="numberInfoSubTitle">瀹屾垚鐜�</div>
<div class="numberInfoValue"><span id="companyRate">92</span>%</div>
</div>
</div>
<div class="layui-row" style="margin-top: 50px;">
<div>涓汉鏁版嵁</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">鍏ㄥ勾鐩爣</div>
+ <div class="numberInfoSubTitle">骞村害閿�鍞洰鏍�</div>
<div class="numberInfoValue">
- <span id="personYearTarget">124,543,233</span><em class="numberInfoSuffix">鍏�</em>
+ <span id="personYearTarget">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">宸插畬鎴愪氦鏄�</div>
+ <div class="numberInfoSubTitle">宸插畬鎴愰攢鍞换鍔�</div>
<div class="numberInfoValue">
- <span id="personSuccess">124,543,233</span><em class="numberInfoSuffix">鍏�</em>
+ <span id="personSuccess">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">鏈畬鎴愪氦鏄�</div>
+ <div class="numberInfoSubTitle">鏈畬鎴愰攢鍞换鍔�</div>
<div class="numberInfoValue">
- <span id="personProgress">124,543,233</span><em class="numberInfoSuffix">鍏�</em>
+ <span id="personProgress">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
</div>
</div>
<div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
- <div class="numberInfoSubTitle">浜ゆ槗鐜�</div>
+ <div class="numberInfoSubTitle">瀹屾垚鐜�</div>
<div class="numberInfoValue"><span id="personRate">92</span>%</div>
+ </div>
+ </div>
+ <div class="layui-row" style="margin-top: 40px;">
+ <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
+ <div class="numberInfoSubTitle">璺熻釜椤圭洰鏁伴噺</div>
+ <div class="numberInfoValue">
+ <span id="progressCount">124</span><em class="numberInfoSuffix">涓�</em>
+ </div>
+ </div>
+ <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
+ <div class="numberInfoSubTitle">閲戦</div>
+ <div class="numberInfoValue">
+ <span id="progressMoney">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
+ </div>
+ </div>
+ <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
+ <div class="numberInfoSubTitle">鎴愪氦椤圭洰鏁伴噺</div>
+ <div class="numberInfoValue">
+ <span id="successCount">121</span><em class="numberInfoSuffix">涓�</em>
+ </div>
+ </div>
+ <div class="layui-col-xs12 layui-col-sm6 layui-col-lg3 text-center">
+ <div class="numberInfoSubTitle">閲戦</div>
+ <div class="numberInfoValue">
+ <span id="successMoney">124,543,233</span><em class="numberInfoSuffix">涓囧厓</em>
+ </div>
</div>
</div>
</div>
@@ -102,7 +128,7 @@
</div>
<div class="layui-col-xs12 layui-col-md4">
- <div class="layui-card" style="height: 299px;overflow: hidden;">
+ <div class="layui-card" style="height: 403px;overflow: hidden;">
<div class="layui-card-header">鍏徃鍏憡</div>
<div class="layui-card-body" id="companyPostId">
</div>
@@ -252,6 +278,10 @@
$("#personSuccess").text(res.data.successMoney)
$("#personProgress").text(res.data.progressMoney)
$("#personRate").text(res.data.yearTransactionRate)
+ $("#progressCount").text(res.data.progressCount)
+ $("#successCount").text(res.data.successCount)
+ $("#progressMoney").text(res.data.progressMoney)
+ $("#successMoney").text(res.data.successMoney)
}
});
--
Gitblit v1.9.1