From bb8b200d53171dcc0727c845c435f655b3d2f55a Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期一, 08 八月 2022 17:58:36 +0800
Subject: [PATCH] 年月fix

---
 emergency/emergency-service/src/main/resource/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 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 692a495..3a829e6 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
@@ -31,6 +31,7 @@
             LEFT JOIN emergency_plan c ON b.plan_id = c.id
         WHERE
             a.del_flag = 0
+        <if test="query.status != null">and a.status = #{query.status}</if>
     </select>
 
     <insert id="addEmergencyDrillExecute" parameterType="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteInfo"
@@ -115,4 +116,50 @@
     <update id="deleteEmergencyDrillExecute">
         update emergency_drill_execute set del_flag = 1 where id = #{id}
     </update>
+
+    <update id="updateStatusById">
+        update emergency_drill_execute set status = 1 where id = #{drillExecuteId}
+    </update>
+
+    <select id="selectEmergencyDrillExecuteIntervalTime" resultType="java.lang.Integer">
+        SELECT datediff( now( ), ( SELECT max( gmt_create ) FROM `emergency_drill_execute` ) )
+    </select>
+
+    <resultMap type="com.gkhy.safePlatform.emergency.entity.EmergencyDrillExecuteCountChart"
+               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
+        count( 0 ) AS num,
+        DATE_FORMAT( a.gmt_create, '%Y-%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[ >= ]]> #{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' )
+    </select>
 </mapper>

--
Gitblit v1.9.2