From 233fb69fa9d1694e97337d74fa3da72cacda04c1 Mon Sep 17 00:00:00 2001 From: songhuangfeng123 <shf18767906695@163.com> Date: 星期四, 18 八月 2022 17:25:33 +0800 Subject: [PATCH] 目标统计 --- incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml | 34 ++++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) diff --git a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml index 6b1a340..3a9ba3d 100644 --- a/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml +++ b/incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml @@ -61,6 +61,7 @@ <if test="accidentHandling != null and accidentHandling != ''">accident_handling,</if> <if test="fillInUserUid != null ">fill_in_user_uid,</if> <if test="fillInTime != null ">fill_in_time,</if> + <if test="fillInUserName != null and fillInUserName != ''">fill_in_user_name,</if> <if test="relevantPersonnelRecords != null and relevantPersonnelRecords != ''">relevant_personnel_records,</if> <if test="otherMaterials != null and otherMaterials != ''">other_materials,</if> </trim> @@ -89,6 +90,7 @@ <if test="accidentHandling != null and accidentHandling != ''">#{accidentHandling},</if> <if test="fillInUserUid != null ">#{fillInUserUid},</if> <if test="fillInTime != null ">#{fillInTime},</if> + <if test="fillInUserName != null and fillInUserName != ''">#{fillInUserName},</if> <if test="relevantPersonnelRecords != null and relevantPersonnelRecords != ''">#{relevantPersonnelRecords},</if> <if test="otherMaterials != null and otherMaterials != ''">#{otherMaterials},</if> </trim> @@ -114,6 +116,7 @@ <result column="rectification_measures" property="rectificationMeasures"/> <result column="accident_handling" property="accidentHandling"/> <result column="fill_in_user_uid" property="fillInUserUid"/> + <result column="fill_in_user_name" property="fillInUserName"/> <result column="fill_in_time" property="fillInTime"/> <result column="relevant_personnel_records" property="relevantPersonnelRecords"/> <result column="other_materials" property="otherMaterials"/> @@ -140,6 +143,7 @@ a.`accident_handling`, a.`fill_in_user_uid`, a.fill_in_time, + a.fill_in_user_name, a.`relevant_personnel_records`, a.`other_materials`, b.accident_name AS accidentName, @@ -176,6 +180,7 @@ <if test="accidentHandling != null and accidentHandling != ''">accident_handling = #{accidentHandling},</if> <if test="fillInUserUid != null ">fill_in_user_uid = #{fillInUserUid},</if> <if test="fillInTime != null ">fill_in_time = #{fillInTime},</if> + <if test="fillInUserName != null and fillInUserName != ''">fill_in_user_name = #{fillInUserName},</if> <if test="relevantPersonnelRecords != null and relevantPersonnelRecords != ''">relevant_personnel_records = #{relevantPersonnelRecords},</if> <if test="otherMaterials != null and otherMaterials != ''">other_materials = #{otherMaterials},</if> </trim> @@ -185,4 +190,33 @@ <update id="deleteAccidentReportById"> update accident_report set del_flag = 1 where id = #{id} </update> + + + <resultMap type="com.gkhy.safePlatform.incidentManage.entity.AccidentReportCount" + id="emergencyDrillExecuteCountChart"> + <result column="num" property="num"/> + <result column="name" property="name"/> + <result column="minorInjuryNum" property="minorInjuryNum"/> + <result column="seriousInjuryNum" property="seriousInjuryNum"/> + <result column="deathNum" property="deathNum"/> + <result column="economicLoss" property="economicLoss"/> + </resultMap> + <select id="selectByTimeAndType" resultMap="emergencyDrillExecuteCountChart"> + SELECT + a.accident_level AS `name`, + count( 0 ) AS num, + sum( economic_loss ) AS economicLoss, + sum( minor_injury_num ) AS minorInjuryNum, + sum( serious_injury_num ) AS seriousInjuryNum, + sum( death_num ) AS deathNum + FROM + `accident_report` a + WHERE + 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 + accident_level + </select> </mapper> -- Gitblit v1.9.2