From f1234928a8b1dba1cbd3b56c9513ec0c16596dbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=85=B4=E7=90=B3?= <1911390090@qq.com>
Date: Tue, 27 Feb 2024 11:39:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E9=80=9A=E4=BA=8B=E6=95=85=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=8F=82=E6=95=B0=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/zc/business/domain/DcEventAccident.java     | 4 ++--
 .../resources/mapper/business/DcEventAccidentMapper.xml  | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/zc-business/src/main/java/com/zc/business/domain/DcEventAccident.java b/zc-business/src/main/java/com/zc/business/domain/DcEventAccident.java
index a794ccc1..9fe1d25a 100644
--- a/zc-business/src/main/java/com/zc/business/domain/DcEventAccident.java
+++ b/zc-business/src/main/java/com/zc/business/domain/DcEventAccident.java
@@ -48,8 +48,8 @@ public class DcEventAccident extends BaseEntity {
      * 5-自燃
      * 6-追尾
      */
-    @ApiModelProperty("交通事故类型     * 1-侧翻* 2-撞障碍物* 3-货物洒落* 4-撞护栏* 5-自燃* 6-追尾")
-    private Long accidentType;
+/*    @ApiModelProperty("交通事故类型     * 1-侧翻* 2-撞障碍物* 3-货物洒落* 4-撞护栏* 5-自燃* 6-追尾")
+    private Long accidentType;*/
 
     /**
      * 地点方式
diff --git a/zc-business/src/main/resources/mapper/business/DcEventAccidentMapper.xml b/zc-business/src/main/resources/mapper/business/DcEventAccidentMapper.xml
index aec41677..6c6964bb 100644
--- a/zc-business/src/main/resources/mapper/business/DcEventAccidentMapper.xml
+++ b/zc-business/src/main/resources/mapper/business/DcEventAccidentMapper.xml
@@ -7,7 +7,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="id"    column="id"    />
         <result property="reporterName"    column="reporter_name"    />
         <result property="reporterPhoneNumber"    column="reporter_phone_number"    />
-        <result property="accidentType"    column="accident_type"    />
+<!--
+-->
         <result property="locationType"    column="location_type"    />
         <result property="trafficJam"    column="traffic_jam"    />
         <result property="weatherCondition"    column="weather_condition"    />
@@ -35,7 +36,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDcEventAccidentVo">
-        select id, reporter_name, reporter_phone_number, accident_type, location_type, traffic_jam, weather_condition, impact_level, is_reverse_cargo, is_maintenance, police_contact, towing_service_contact, congestion_ahead, at_intersection, on_curve, spillage_item, vehicle_owner_phone, small_car, trucks, buses, tankers, minor_injuries, serious_injuries, fatalities, is_private, facility_id,location,ramp_id from dc_event_accident
+        select id, reporter_name, reporter_phone_number, location_type, traffic_jam, weather_condition, impact_level, is_reverse_cargo, is_maintenance, police_contact, towing_service_contact, congestion_ahead, at_intersection, on_curve, spillage_item, vehicle_owner_phone, small_car, trucks, buses, tankers, minor_injuries, serious_injuries, fatalities, is_private, facility_id,location,ramp_id from dc_event_accident
     </sql>
 
     <select id="selectDcEventAccidentList" parameterType="DcEventAccident" resultMap="DcEventAccidentResult">
@@ -43,7 +44,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="reporterName != null  and reporterName != ''"> and reporter_name like concat('%', #{reporterName}, '%')</if>
             <if test="reporterPhoneNumber != null  and reporterPhoneNumber != ''"> and reporter_phone_number = #{reporterPhoneNumber}</if>
-            <if test="accidentType != null "> and accident_type = #{accidentType}</if>
             <if test="locationType != null "> and location_type = #{locationType}</if>
             <if test="trafficJam != null "> and traffic_jam = #{trafficJam}</if>
             <if test="weatherCondition != null "> and weather_condition = #{weatherCondition}</if>
@@ -80,7 +80,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null">id,</if>
             <if test="reporterName != null and reporterName != ''">reporter_name,</if>
             <if test="reporterPhoneNumber != null and reporterPhoneNumber != ''">reporter_phone_number,</if>
-            <if test="accidentType != null">accident_type,</if>
             <if test="locationType != null">location_type,</if>
             <if test="trafficJam != null">traffic_jam,</if>
             <if test="weatherCondition != null">weather_condition,</if>
@@ -110,7 +109,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="id != null">#{id},</if>
             <if test="reporterName != null and reporterName != ''">#{reporterName},</if>
             <if test="reporterPhoneNumber != null and reporterPhoneNumber != ''">#{reporterPhoneNumber},</if>
-            <if test="accidentType != null">#{accidentType},</if>
             <if test="locationType != null">#{locationType},</if>
             <if test="trafficJam != null">#{trafficJam},</if>
             <if test="weatherCondition != null">#{weatherCondition},</if>
@@ -143,7 +141,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="reporterName != null and reporterName != ''">reporter_name = #{reporterName},</if>
             <if test="reporterPhoneNumber != null and reporterPhoneNumber != ''">reporter_phone_number = #{reporterPhoneNumber},</if>
-            <if test="accidentType != null">accident_type = #{accidentType},</if>
             <if test="locationType != null">location_type = #{locationType},</if>
             <if test="trafficJam != null">traffic_jam = #{trafficJam},</if>
             <if test="weatherCondition != null">weather_condition = #{weatherCondition},</if>