From 5ea8ef80312e8c1d3365abe7106622d676def195 Mon Sep 17 00:00:00 2001 From: huangzhen <867127663@qq.com> Date: 星期五, 30 九月 2022 16:41:09 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml index 44f0894..46ad02d 100644 --- a/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml +++ b/src/main/resources/mybatis/doublePrevention/PreventRiskDangerInfoMapper.xml @@ -12,6 +12,7 @@ <result column="danger_reason" property="dangerReason"/> <result column="hazard_danger_type" property="hazardDangerType"/> <result column="danger_state" property="dangerState"/> + <result column="danger_result" property="dangerResult"/> <result column="timeout_flag" property="timeoutFlag"/> <result column="report_time" property="reportTime"/> <result column="update_report_data_time" property="updateReportDataTime"/> @@ -23,7 +24,7 @@ <!-- int insertDangerInfo(PreventRiskDangerInfo dangerInfo);--> <insert id="insertDangerInfo"> insert into prevent_risk_danger_info values - (null, #{uuid}, #{dangerCheckPointId}, #{hazardCode}, #{dangerSrc}, #{dangerDesc}, #{dangerReason}, #{hazardDangerType}, #{dangerState}, + (null, #{uuid}, #{dangerCheckPointId}, #{hazardCode}, #{dangerSrc}, #{dangerDesc}, #{dangerReason}, #{dangerResult}, #{hazardDangerType}, #{dangerState}, #{timeoutFlag}, #{reportTime}, #{updateReportDataTime}, #{reportStatus}, #{reportSwitch}) </insert> @@ -36,6 +37,7 @@ danger_reason = #{dangerReason}, hazard_danger_type = #{hazardDangerType}, danger_state = #{dangerState}, + danger_result =#{dangerResult} timeout_flag = #{timeoutFlag}, update_report_data_time = #{updateReportDataTime}, report_status = #{reportStatus}, -- Gitblit v1.9.2