From 17f8dd032fc267b38cdddc88de416aeab2600f90 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 21 九月 2022 14:38:23 +0800
Subject: [PATCH] 根据物资类型分类-应急物资列表

---
 emergency/emergency-service/src/main/resources/config/mapper/emergency/EmergencyDrillExecuteInfoMapper.xml |   50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 49 insertions(+), 1 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 6a40c03..9da404b 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
@@ -174,9 +174,57 @@
     </select>
 
 
+    <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, '%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="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' )
+    </select>
+
+
     <select id="selectEmergencyDrillExecuteIntervalTimeByDeptId" resultType="java.lang.String">
         SELECT
-	        DATE_FORMAT( max( a.gmt_create ), '%Y-%m-%d' ) AS lastTime
+	        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

--
Gitblit v1.9.2