From 9f122a41255d18f04a82d8be3b038a95c2c18d95 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:26:08 +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 | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 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 9c3a4a6..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
@@ -173,10 +173,16 @@
DATE_FORMAT( a.gmt_create, '%Y' )
</select>
- <select id="selectByDayAndDept" resultMap="emergencyDrillExecuteCountChart">
+
+ <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteCountRPC"
+ id="emergencyDrillExecuteCountRPC">
+ <result column="num" property="num"/>
+ <result column="name" property="name"/>
+ </resultMap>
+ <select id="selectByDayAndDept" resultMap="emergencyDrillExecuteCountRPC">
SELECT
count( 0 ) AS num,
- DATE_FORMAT( a.gmt_create, '%Y-%m-%d' ) AS `name`
+ DATE_FORMAT( a.gmt_create, '%d' ) AS `name`
FROM
`emergency_drill_execute` a
LEFT JOIN emergency_drill_plan b ON a.drill_plan_id = b.id
@@ -191,7 +197,30 @@
</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">
+ SELECT
+ count( 0 ) AS num,
+ DATE_FORMAT( a.gmt_create, '%m' ) AS `name`
+ FROM
+ `emergency_drill_execute` a
+ LEFT JOIN emergency_drill_plan b ON a.drill_plan_id = b.id
+ WHERE
+ a.del_flag = 0
+ AND a.gmt_create <![CDATA[ >= ]]> #{startTime}
+ AND a.gmt_create <![CDATA[ <= ]]> #{endTime}
+ <if test="deptIds != null " >
+ and b.department_id in
+ <foreach item="id" collection="deptIds" open="(" separator="," close=")">
+ #{id}
+ </foreach>
+ </if>
+ GROUP BY
+ DATE_FORMAT( a.gmt_create, '%Y-%m' ),
+ DATE_FORMAT( a.gmt_create, '%m' )
</select>
--
Gitblit v1.9.2