From 5bbbae5f707018dd2619a221a1a7328f014c4068 Mon Sep 17 00:00:00 2001
From: gaowdong <gaowdong@bonus.com>
Date: Tue, 31 Dec 2024 14:41:00 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=EF=BC=9A=203614=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=E9=A1=B9=E7=9B=AE=E5=8F=82=E5=BB=BA=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8DTOP5=E5=B1=95=E7=A4=BA=E6=95=B0=E6=8D=AE=E4=B8=8E?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E5=92=8C=E5=8E=9F=E5=9E=8B=E4=B8=8D=E7=AC=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/homePage/HomePageMapper.xml        | 21 +++++++------------
 .../static/js/work/indexScreen/indexScreen.js |  4 ++--
 .../pages/work/indexScreen/indexScreen.html   | 10 ++++-----
 3 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/modules/bmw/src/main/resources/mapper/homePage/HomePageMapper.xml b/modules/bmw/src/main/resources/mapper/homePage/HomePageMapper.xml
index 6477915..a020860 100644
--- a/modules/bmw/src/main/resources/mapper/homePage/HomePageMapper.xml
+++ b/modules/bmw/src/main/resources/mapper/homePage/HomePageMapper.xml
@@ -599,19 +599,14 @@
 
     <select id="getProRank" resultType="com.bonus.bmw.homePage.entity.ProMsgBean">
         select a.* from (
-              select a.*, bp.name as proName, pm.id as subComId,
-              pm.name as SubComName from (
-                  select pro_id as proId, count(DISTINCT sub_id) as subNum from bm_sub_contract
-                  where is_active = 1
-                  GROUP BY pro_id
-              ) a
-              LEFT JOIN bm_project bp ON bp.id = a.proId AND bp.is_active = '1'
-              left join (
-                  SELECT po.id, po.`name`
-                  FROM bm_project_general AS po
-                  WHERE po.is_active = '1'
-              ) pm on pm.id = bp.project_general_id
-              ORDER BY a.subNum DESC
+            select  bs.id as subComId, bs.sub_name as SubComName, a.proNum as subNum, '' as proId
+                from (
+            select sub_id as subId, count(pro_id) as proNum from bm_sub_contract
+                where is_active = 1
+                GROUP BY sub_id
+            ) a
+                LEFT JOIN bm_subcontractor bs ON bs.id = a.subId AND bs.is_active = '1'
+                ORDER BY a.proNum DESC
         ) a limit 5
     </select>
 
diff --git a/modules/bmw/src/main/resources/static/js/work/indexScreen/indexScreen.js b/modules/bmw/src/main/resources/static/js/work/indexScreen/indexScreen.js
index acf060a..f274b1b 100644
--- a/modules/bmw/src/main/resources/static/js/work/indexScreen/indexScreen.js
+++ b/modules/bmw/src/main/resources/static/js/work/indexScreen/indexScreen.js
@@ -795,7 +795,7 @@ function proInformationLevelECharts(listRank) {
     let titleName = [];
     let data = [];
     for (let i = 0; i < listRank.length; i++) {
-        titleName.push([[listRank[i].proName]]);
+        titleName.push([[listRank[i].subComName]]);
         data.push([listRank[i].subNum]);
     }
     // var myColor = ['#FFA94C', '#8167F5', '#24D2D3', '#52C1F5', '#FF7A8C'];
@@ -809,7 +809,7 @@ function proInformationLevelECharts(listRank) {
         if (i >= 5) {
             break;
         } else {
-            $("#proName" + i).text(titleName[i]);
+            $("#subComName" + i).text(titleName[i]);
         }
     }
     for (let i = 0; i < data.length; i++) {
diff --git a/modules/bmw/src/main/resources/static/pages/work/indexScreen/indexScreen.html b/modules/bmw/src/main/resources/static/pages/work/indexScreen/indexScreen.html
index f0957e8..a59128c 100644
--- a/modules/bmw/src/main/resources/static/pages/work/indexScreen/indexScreen.html
+++ b/modules/bmw/src/main/resources/static/pages/work/indexScreen/indexScreen.html
@@ -213,7 +213,7 @@
                         <div class="grid-demo grid-demo-bg1"><img src='../../../img/fileIcon/No.1.png' width="25" height="20"></div>
                     </div>
                     <div class="layui-col-md4">
-                        <div class="grid-demo" id="proName0"></div>
+                        <div class="grid-demo" id="subComName0"></div>
                     </div>
                     <div class="layui-col-md4">
                         <div class="grid-demo grid-demo-bg1" id="subNum0"></div>
@@ -225,7 +225,7 @@
                         <div class="grid-demo grid-demo-bg1"><img src='../../../img/fileIcon/No.2.png' width="25" height="20"></div>
                     </div>
                     <div class="layui-col-md4">
-                        <div class="grid-demo" id="proName1"></div>
+                        <div class="grid-demo" id="subComName1"></div>
                     </div>
                     <div class="layui-col-md4">
                         <div class="grid-demo grid-demo-bg1" id="subNum1"></div>
@@ -237,7 +237,7 @@
                         <div class="grid-demo grid-demo-bg1"><img src='../../../img/fileIcon/No.3.png' width="25" height="20"></div>
                     </div>
                     <div class="layui-col-md4">
-                        <div class="grid-demo" id="proName2"></div>
+                        <div class="grid-demo" id="subComName2"></div>
                     </div>
                     <div class="layui-col-md4">
                         <div class="grid-demo grid-demo-bg1" id="subNum2"></div>
@@ -249,7 +249,7 @@
                         <div class="grid-demo grid-demo-bg1"><img src='../../../img/fileIcon/No.4.png' width="25" height="20"></div>
                     </div>
                     <div class="layui-col-md4">
-                        <div class="grid-demo" id="proName3"></div>
+                        <div class="grid-demo" id="subComName3"></div>
                     </div>
                     <div class="layui-col-md4">
                         <div class="grid-demo grid-demo-bg1" id="subNum3"></div>
@@ -261,7 +261,7 @@
                         <div class="grid-demo grid-demo-bg1"><img src='../../../img/fileIcon/No.5.png' width="25" height="20"></div>
                     </div>
                     <div class="layui-col-md4">
-                        <div class="grid-demo" id="proName4"></div>
+                        <div class="grid-demo" id="subComName4"></div>
                     </div>
                     <div class="layui-col-md4">
                         <div class="grid-demo grid-demo-bg1" id="subNum4"></div>