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
---
emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
index 9da404b..1fa5e29 100644
--- a/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
@@ -197,7 +197,8 @@
</foreach>
</if>
GROUP BY
- DATE_FORMAT( a.gmt_create, '%Y-%m-%d' )
+ DATE_FORMAT( a.gmt_create, '%Y-%m-%d' ),
+ DATE_FORMAT( a.gmt_create, '%d' )
</select>
<select id="selectByMonthAndDeptForIntegerMonth" resultMap="emergencyDrillExecuteCountRPC">
@@ -218,7 +219,8 @@
</foreach>
</if>
GROUP BY
- DATE_FORMAT( a.gmt_create, '%Y-%m' )
+ DATE_FORMAT( a.gmt_create, '%Y-%m' ),
+ DATE_FORMAT( a.gmt_create, '%m' )
</select>
--
Gitblit v1.9.2