From 233fb69fa9d1694e97337d74fa3da72cacda04c1 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期四, 18 八月 2022 17:25:33 +0800
Subject: [PATCH] 目标统计
---
emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml | 52 +++++++++++++++++++++++++++++++---------------------
1 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
index 3a829e6..cb840df 100644
--- a/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
+++ b/emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml
@@ -125,29 +125,13 @@
SELECT datediff( now( ), ( SELECT max( gmt_create ) FROM `emergency_drill_execute` ) )
</select>
- <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteCountChart"
+ <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteCountData"
id="emergencyDrillExecuteCountChart">
<result column="num" property="num"/>
<result column="name" property="name"/>
</resultMap>
- <select id="selectByMouthTimeAndType" resultMap="emergencyDrillExecuteCountChart">
- SELECT
- count( 0 ) AS num,
- DATE_FORMAT( a.gmt_create, '%Y-%m-%d' ) 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[ >= ]]> #{query.startTime}
- AND a.gmt_create <![CDATA[ <= ]]> #{query.endTime}
- <if test="query.level != null and query.level != ''" >and b.drill_level = #{query.level}</if>
- GROUP BY
- DATE_FORMAT( a.gmt_create, '%Y-%m-%d' )
- </select>
-
- <select id="selectByYearTimeAndType" resultMap="emergencyDrillExecuteCountChart">
+ <select id="selectByMonthAndDept" resultMap="emergencyDrillExecuteCountChart">
SELECT
count( 0 ) AS num,
DATE_FORMAT( a.gmt_create, '%Y-%m' ) AS `name`
@@ -156,10 +140,36 @@
LEFT JOIN emergency_drill_plan b ON a.drill_plan_id = b.id
WHERE
a.del_flag = 0
- AND a.gmt_create <![CDATA[ >= ]]> #{query.startTime}
- AND a.gmt_create <![CDATA[ <= ]]> #{query.endTime}
- <if test="query.level != null and query.level != ''" >and b.drill_level = #{query.level}</if>
+ 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' )
</select>
+
+ <select id="selectByYearAndDept" resultMap="emergencyDrillExecuteCountChart">
+ SELECT
+ count( 0 ) AS num,
+ DATE_FORMAT( a.gmt_create, '%Y' ) 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' )
+ </select>
</mapper>
--
Gitblit v1.9.2