From 3b0113d16c949f58aa2ba9cbdb1b8dc530d81479 Mon Sep 17 00:00:00 2001
From: luoyu <mingyuxuezhang@qq.com>
Date: Fri, 23 May 2025 15:35:47 +0800
Subject: [PATCH] =?UTF-8?q?20250523-=E4=BF=AE=E6=94=B9=E4=BC=9A=E8=AE=AE?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=95=B0=E6=8D=AE=E7=BB=9F=E8=AE=A1=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84=E4=BC=9A=E8=AE=AE=E5=AE=A4=E4=BD=BF=E7=94=A8=E6=83=85?=
 =?UTF-8?q?=E5=86=B5=E6=8E=92=E5=BA=8F=E5=92=8C=E9=83=A8=E9=97=A8=E5=BC=80?=
 =?UTF-8?q?=E4=BC=9A=E6=83=85=E5=86=B5=E6=95=B0=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ics/admin/service/impl/IMeetingStatsServiceImpl.java   | 7 +++++++
 .../src/main/java/com/ics/admin/vo/MRStatsVo.java          | 6 ++++++
 .../src/main/resources/mapper/admin/MeetingStatsMapper.xml | 6 +++---
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingStatsServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingStatsServiceImpl.java
index 889a9d1..9f1965c 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingStatsServiceImpl.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/IMeetingStatsServiceImpl.java
@@ -104,13 +104,20 @@ public class IMeetingStatsServiceImpl implements IMeetingStatsService {
             List<String> y = new ArrayList<>();
             List<Long> zs = new ArrayList<>();
             List<MRStatsVo> list = meetingStatsMapper.roomRankStats(start, end);
+            
+            System.out.println("会议室使用排名原始数据: " + list.size() + "条");
             for (MRStatsVo mrStatsVo : list) {
+                System.out.println("会议室: " + mrStatsVo.getName() + 
+                                  ", 楼层: " + mrStatsVo.getFloor() + 
+                                  ", 房间号: " + mrStatsVo.getRoomNum() + 
+                                  ", 使用次数: " + mrStatsVo.getValue());
                 y.add(mrStatsVo.getName());
                 zs.add(mrStatsVo.getValue());
             }
             roomRank.put("y", y);
             roomRank.put("total", zs);
             map.put("roomRank", roomRank);
+            System.out.println("处理后的会议室使用排名数据: y=" + y + ", total=" + zs);
         }
         if (true) {//服务情况
             List<Map<String, Object>> serve = new ArrayList<>();
diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MRStatsVo.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MRStatsVo.java
index 3a944fd..1fdc011 100644
--- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MRStatsVo.java
+++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MRStatsVo.java
@@ -20,6 +20,12 @@ public class MRStatsVo implements Serializable {
     private String name;
 
     private Long value;
+    
+    // 楼层
+    private String floor;
+    
+    // 房间号
+    private String roomNum;
 
     @JsonIgnore
     private Date start;
diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingStatsMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingStatsMapper.xml
index 3c27366..376d867 100644
--- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingStatsMapper.xml
+++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingStatsMapper.xml
@@ -55,10 +55,10 @@
     <!--会议室使用排名-->
     <select id="roomRankStats" resultType="com.ics.admin.vo.MRStatsVo">
         <![CDATA[
-        select room.name name,count(mr.id) value
+        select room.name name, room.floor floor, room.room_num roomNum, count(mr.id) value
         from ics_meeting_room room left join ics_meeting_reservation mr
             on room.id=mr.room_id and room.delete_flag=0 and mr.delete_flag=0 and mr.status>7 and mr.start between #{start} and #{end}
-        GROUP BY room.name order by value desc
+        GROUP BY room.name, room.floor, room.room_num order by room.floor, room.room_num
         ]]>
     </select>
 
@@ -91,7 +91,7 @@
         <![CDATA[
         select mr.user_org name,count(mr.id) value from ics_meeting_reservation mr
         where mr.delete_flag=0 and mr.status>7 and mr.start between #{start} and #{end}
-        GROUP BY mr.user_org order by value desc limit 10
+        GROUP BY mr.user_org order by value desc limit 20
         ]]>
     </select>