From 148f5cd7edb3eea8503bc1e81bd01c044ec84e87 Mon Sep 17 00:00:00 2001
From: lujiang <ljxuzhou@163.com>
Date: Fri, 4 Oct 2024 17:49:54 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=9F=E8=AE=A1=E8=AF=AD?=
 =?UTF-8?q?=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/mapper/admin/MeetingStatsMapper.xml   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

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 85f63cf..fe663c8 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
@@ -65,10 +65,11 @@
     <!-- 服务情况 -->
     <select id="serveStats" resultType="com.ics.admin.vo.MRStatsVo">
         <![CDATA[
-        select ms.name name,count(ms.id) value
-        from ics_meeting_serve ms,ics_meeting_reservation mr
-        where ms.rid=mr.id and ms.delete_flag=0 and mr.delete_flag=0 and mr.status>7 and mr.start between #{start} and #{end}
-        GROUP BY ms.name order by ms.id
+        select type.dict_label name,count(zj.id) value from sys_dict_data type left join
+            (select ms.value value,mr.id id
+            from ics_meeting_serve ms,ics_meeting_reservation mr where ms.rid=mr.id and ms.delete_flag=0 and mr.delete_flag=0  and mr.status>7 and mr.start between #{start} and #{end}
+            ) zj on type.dict_value=zj.value
+        where type.dict_type='mm_service' and type.status=0 group by type.dict_label order by type.dict_sort
         ]]>
     </select>