From 4dca59b54c8fc8815e3f533ce04f5e1b1328852f Mon Sep 17 00:00:00 2001
From: SZH <szh_hello@163.com>
Date: 星期三, 16 十一月 2022 11:04:25 +0800
Subject: [PATCH] 1、调整部署环境配置 2、升级依赖
---
incident-manage/incident-manage-service/src/main/resources/config/mapper/incidentManage/AccidentReportInfoMapper.xml | 142 +++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 142 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..fde785e 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,141 @@
<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
+ 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`
+ WHERE
+ del_flag = 0
+ AND gmt_create <![CDATA[ >= ]]> #{query.startTime}
+ AND gmt_create <![CDATA[ <= ]]> #{query.endTime}
+ <if test="query.level != null and query.level != ''" >and accident_level = #{query.level}</if>
+ GROUP BY
+ accident_level
+ </select>
+
+ <resultMap type="com.gkhy.safePlatform.incidentManage.entity.AccidentReportCountRPC"
+ id="accidentReportCountRPC">
+ <result column="time" property="time"/>
+ <result column="num" property="num"/>
+ <result column="level" property="level"/>
+ <result column="minorInjuryNum" property="minorInjuryNum"/>
+ <result column="seriousInjuryNum" property="seriousInjuryNum"/>
+ <result column="deathNum" property="deathNum"/>
+ <result column="economicLoss" property="economicLoss"/>
+ </resultMap>
+ <select id="getCountForRPCByDeptIdAndMonth" resultMap="accidentReportCountRPC">
+ SELECT
+ DATE_FORMAT( a.gmt_create, '%m' ) as time,
+ a.accident_level AS `level`,
+ count( 0 ) AS num,
+ sum( a.economic_loss ) AS economicLoss,
+ sum( a.minor_injury_num ) AS minorInjuryNum,
+ sum( a.serious_injury_num ) AS seriousInjuryNum,
+ sum( a.death_num ) AS deathNum
+ FROM
+ `accident_report` a
+ INNER JOIN `accident_express` b ON a.accident_express_id = b.id
+ AND b.accident_department_id = #{deptId}
+ WHERE
+ a.del_flag = 0
+ AND a.gmt_create <![CDATA[ >= ]]> #{startTime}
+ AND a.gmt_create <![CDATA[ <= ]]> #{endTime}
+ GROUP BY
+ DATE_FORMAT( a.gmt_create, '%Y-%m' ),
+ a.accident_level,
+ DATE_FORMAT( a.gmt_create, '%m' )
+ </select>
+
+ <select id="getCountForRPCByDeptIdAndDay" resultMap="accidentReportCountRPC">
+ SELECT
+ DATE_FORMAT( a.gmt_create, '%d' ) as time,
+ a.accident_level AS `level`,
+ count( 0 ) AS num,
+ sum( a.economic_loss ) AS economicLoss,
+ sum( a.minor_injury_num ) AS minorInjuryNum,
+ sum( a.serious_injury_num ) AS seriousInjuryNum,
+ sum( a.death_num ) AS deathNum
+ FROM
+ `accident_report` a
+ INNER JOIN `accident_express` b ON a.accident_express_id = b.id
+ AND b.accident_department_id = #{deptId}
+ WHERE
+ a.del_flag = 0
+ AND a.gmt_create <![CDATA[ >= ]]> #{startTime}
+ AND a.gmt_create <![CDATA[ <= ]]> #{endTime}
+ GROUP BY
+ DATE_FORMAT( a.gmt_create, '%Y-%m-%d' ),
+ a.accident_level,
+ DATE_FORMAT( a.gmt_create, '%d' )
+ </select>
+
+ <select id="getAccidentCountByDeptIdsAndTime" resultType="com.gkhy.safePlatform.incidentManage.entity.AccidentResultCountDO">
+ SELECT
+ count( 0 ) AS accidentCount,
+ sum( a.economic_loss ) AS economicLoss,
+ sum( a.minor_injury_num ) AS minorInjuryCount,
+ sum( a.serious_injury_num ) AS seriousInjuryCount,
+ sum( a.death_num ) AS deathCount,
+ a.accident_level AS accidentLevel,
+ DATE_FORMAT( a.gmt_create, '%m' ) AS month,
+ DATE_FORMAT( a.gmt_create, '%Y' ) AS year,
+ b.accident_department_id AS deptId
+ FROM
+ `accident_report` a
+ INNER JOIN `accident_express` b ON a.accident_express_id = b.id
+ WHERE
+ a.del_flag = 0
+ AND b.accident_department_id IN
+ <foreach collection="deptIds" item="deptId" open="(" close=")" separator=",">
+ #{deptId}
+ </foreach>
+ AND DATE( a.gmt_create ) BETWEEN #{startTime}
+ AND #{endTime}
+ GROUP BY
+ a.accident_level,
+ DATE_FORMAT( a.gmt_create, '%Y-%m' ),
+ DATE_FORMAT( a.gmt_create, '%m' ),
+ DATE_FORMAT( a.gmt_create, '%Y' ),
+ b.accident_department_id
+ </select>
+ <select id="getAccidentCountByDeptIdAndTime" resultType="com.gkhy.safePlatform.incidentManage.entity.AccidentResultCountDO">
+ SELECT
+ count( 0 ) AS accidentCount,
+ sum( a.economic_loss ) AS economicLoss,
+ sum( a.minor_injury_num ) AS minorInjuryCount,
+ sum( a.serious_injury_num ) AS seriousInjuryCount,
+ sum( a.death_num ) AS deathCount,
+ a.accident_level AS accidentLevel,
+ DATE_FORMAT( a.gmt_create, '%m' ) AS month
+ FROM
+ `accident_report` a
+ INNER JOIN `accident_express` b ON a.accident_express_id = b.id
+ WHERE
+ a.del_flag = 0
+ AND b.accident_department_id = #{deptId}
+ AND DATE( a.gmt_create ) BETWEEN #{startTime}
+ AND #{endTime}
+ GROUP BY
+ a.accident_level,
+ DATE_FORMAT( a.gmt_create, '%Y-%m' ),
+ DATE_FORMAT( a.gmt_create, '%m' )
+ </select>
</mapper>
--
Gitblit v1.9.2