20250523-修改会议管理数据统计中的会议室使用情况排序和部门开会情况数量

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<>();

shoot-hand/ics-admin/src/main/java/com/ics/admin/vo/MRStatsVo.java

@@ -21,6 +21,12 @@ public class MRStatsVo implements Serializable {
 
     private Long value;
     
+    // 楼层
+    private String floor;
+    
+    // 房间号
+    private String roomNum;
+
     @JsonIgnore
     private Date start;
 

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>