From 208b6439eb8e63b6485240a8b466ebdcfd08c57a Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 05 九月 2022 11:27:23 +0800
Subject: [PATCH] 应急统计

---
 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml |   82 +++++++++++++++++++++++++++++++----------
 1 files changed, 62 insertions(+), 20 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 8e603c8..9c3a4a6 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
@@ -131,23 +131,7 @@
         <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,68 @@
         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>
+
+    <select id="selectByDayAndDept" 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[ >= ]]> #{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-%d' )
+    </select>
+
+
+    <select id="selectEmergencyDrillExecuteIntervalTimeByDeptId" resultType="java.lang.String">
+        SELECT
+	        DATE_FORMAT( max( a.gmt_create ), '%Y-%m-%d %H:%i:%s' ) AS lastTime
+        FROM
+            `emergency_drill_execute` a
+            INNER JOIN emergency_drill_plan b ON a.drill_plan_id = b.id
+            AND b.department_id = #{deptId}
+    </select>
+
 </mapper>

--
Gitblit v1.9.2