导出优化

zc-business/src/main/resources/mapper/business/DcWarningMapper.xml

@@ -83,7 +83,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where warning_source = '5' and JSON_EXTRACT(other_config, '$.id') = #{alarmId};
     </select>
     <select id="export" resultType="com.zc.business.domain.DcWarning">
-        SELECT warning.`id`,warning.`stake_mark`, warning.`direction`,warning.end_time,warning.event_cause,
+        SELECT facility.facility_name,
+               warning.`id`,warning.`stake_mark`, warning.`direction`,warning.end_time,warning.event_cause,
                warning.lane,warning.vehicle_type,mark.longitude,mark.latitude,
                warning.`dept_id`,warning.`warning_state`,warning.`warning_time`,
                warning.`user_id`, warning.`warning_source`,warning.`warning_level`,
@@ -91,7 +92,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                warning.`warning_type`,warning.`warning_subclass`,warning.`warning_title`,
                warning.`other_config` FROM dc_warning AS warning
               LEFT JOIN dc_stake_mark AS mark ON mark.stake_mark=warning.stake_mark  and warning.direction =mark.direction
+              left join dc_facility as facility on facility.stake_mark=warning.stake_mark and facility.facility_type=1
         <where>
+            <if test="facilityName != null  and facilityName != ''"> and facility.facility_name like concat('%', #{facilityName}, '%')</if>
             <if test="warningSource == null  || warningSource == ''">and warning.warning_source !=6</if>
             <if test="warningSource != null  and warningSource != ''">and warning.warning_source = #{warningSource}</if>
             <if test="warningState != null  and warningState != ''">and warning.warning_state = #{warningState}</if>