|
@@ -946,8 +946,9 @@
|
|
|
<if test="marker!=null and marker!=''">
|
|
<if test="marker!=null and marker!=''">
|
|
|
and abs(t.marker - ${marker})= (
|
|
and abs(t.marker - ${marker})= (
|
|
|
select min(abs(t.marker - ${marker})) FROM base_pillar t
|
|
select min(abs(t.marker - ${marker})) FROM base_pillar t
|
|
|
- left join v_station v on t.station_id = v.dept_station_id
|
|
|
|
|
|
|
+ left join v_station v on t.station_id = v.station_id
|
|
|
where 1=1
|
|
where 1=1
|
|
|
|
|
+ and t.marker between v.up_start_marker and v.up_end_marker
|
|
|
<if test="stationId!=null and stationId!=''">
|
|
<if test="stationId!=null and stationId!=''">
|
|
|
and t.station_id=#{stationId}
|
|
and t.station_id=#{stationId}
|
|
|
</if>
|
|
</if>
|
wuhonghao