From 357935fb2785dc79f4f47ffa7e1c503bc8cea376 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 16 九月 2022 15:19:50 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master

---
 incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml
index 22d4d4c..2a78a57 100644
--- a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml
+++ b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml
@@ -249,7 +249,8 @@
             AND a.gmt_create <![CDATA[ <= ]]> #{endTime}
         GROUP BY
         	DATE_FORMAT( a.gmt_create, '%Y-%m' ),
-            a.accident_level
+            a.accident_level,
+            DATE_FORMAT( a.gmt_create, '%m' )
     </select>
 
     <select id="getCountForRPCByDeptIdAndDay" resultMap="accidentReportCountRPC">
@@ -271,6 +272,7 @@
             AND a.gmt_create <![CDATA[ <= ]]> #{endTime}
         GROUP BY
         	DATE_FORMAT( a.gmt_create, '%Y-%m-%d' ),
-            a.accident_level
+            a.accident_level,
+            DATE_FORMAT( a.gmt_create, '%d' )
     </select>
 </mapper>

--
Gitblit v1.9.2