fix(gd): 修复线索事件查询中的SQL语法错误

linwei

22 hours ago 08ddfad4530a014094c06fe68b8c2d9a0753403a

 drone-service/drone-fw/src/main/java/org/sxkj/fw/detection/mapper/FwTaskScheduleMapper.xml

@@ -36,44 +36,50 @@

    <select id="selectFwTaskSchedulePage" resultMap="fwTaskScheduleResultMap">
        select
        ts.id,
        ts.device_id,
        ts.area_divide_id,
        ts.defense_scene_id,
        ds.scene_name as defense_scene_name,
        ts.longitude,
        ts.latitude,
        ts.dispatch_user,
        ts.dispatch_start_time,
        ts.dispatch_end_time,
        ts.dispatch_content,
        ts.dispatch_result,
        ts.dispose_measure,
        ts.area_code,
        ts.create_user,
        ts.create_dept,
        ts.create_time,
        ts.update_user,
        ts.update_time,
        ts.is_deleted,
        d.device_sn,
        d.device_name,
        d.device_type,
        d.status as device_status,
        ad.longitude as device_longitude,
        ad.latitude as device_latitude,
        ad.area_name,
        dz.zone_name as defense_zone_name
        from ja_fw_task_schedule ts
        left join ja_fw_device d on d.id = ts.device_id
        left join ja_fw_area_divide ad on ad.id = ts.area_divide_id
        left join ja_fw_defense_scene ds on ds.id = ts.defense_scene_id
        left join ja_fw_defense_zone dz on dz.is_deleted = 0
            ts.id,
            ts.device_id,
            ts.area_divide_id,
            ts.defense_scene_id,
            dsm.scene_name as defense_scene_name,
            ts.longitude,
            ts.latitude,
            ts.dispatch_user,
            ts.dispatch_start_time,
            ts.dispatch_end_time,
            ts.dispatch_content,
            ts.dispatch_result,
            ts.dispose_measure,
            ts.area_code,
            ts.create_user,
            ts.create_dept,
            ts.create_time,
            ts.update_user,
            ts.update_time,
            ts.is_deleted,
            d.device_sn,
            d.device_name,
            d.device_type,
            d.status as device_status,
            ad.area_name,
            dz.zone_name as defense_zone_name
        from
            ja_fw_task_schedule ts
        left join
                ja_fw_device d on d.id::VARCHAR = ts.device_id::VARCHAR
        left join
                ja_fw_area_divide ad on ad.id::VARCHAR = ts.area_divide_id::VARCHAR
        left join
                ja_fw_defense_scene_manage dsm on dsm.id::VARCHAR = ts.defense_scene_id::VARCHAR
        left join
                ja_fw_defense_zone dz on dz.is_deleted = 0
            and dz.defense_scene_ids is not null
            and dz.defense_scene_ids != ''
            and find_in_set(ds.id, replace(dz.defense_scene_ids, ' ', ''))
            and dsm.id::VARCHAR = ANY(string_to_array(replace(dz.defense_scene_ids, ' ', ''), ','))
        <where>
            ts.is_deleted = 0
            <if test="param2.deviceId != null and param2.deviceId != ''">
                and ts.device_id = #{param2.deviceId}
            </if>
            <if test="param2.deviceName != null and param2.deviceName != ''">
                and d.device_name like concat('%', #{param2.deviceName}, '%')
            </if>
@@ -84,7 +90,13 @@
                and d.device_type = #{param2.deviceType}
            </if>
            <if test="param2.status != null and param2.status != ''">
                and d.status = #{param2.status}
                and d.status::text = #{param2.status}::text
            </if>
            <if test="param2.deptList != null and param2.deptList.size > 0">
                and ts.create_dept in
                <foreach collection="param2.deptList" item="deptId" open="(" separator="," close=")">
                    #{deptId}
                </foreach>
            </if>
        </where>
    </select>