|
|
@@ -218,7 +218,7 @@
|
|
|
SELECT
|
|
|
<include refid="Base_Column_List"/>
|
|
|
from base_sdtz t
|
|
|
- LEFT JOIN v_station v on t.station_id = v.station_id
|
|
|
+ LEFT JOIN v_station v on t.station_id = v.dept_station_id
|
|
|
<where>
|
|
|
t.del_flag='0'
|
|
|
<if test="deptId!=null and deptId!=''">
|
|
|
@@ -236,6 +236,8 @@
|
|
|
(#{marker} + 0.0) - (#{pillarArea} + 0.0) BETWEEN (t.start_marker + 0.0) and (t.end_marker + 0.0)
|
|
|
or
|
|
|
(#{marker} + 0.0) + (#{pillarArea} + 0.0) BETWEEN (t.start_marker + 0.0) and (t.end_marker + 0.0)
|
|
|
+ or
|
|
|
+ (#{marker} + 0.0) BETWEEN (t.start_marker + 0.0) and (t.end_marker + 0.0)
|
|
|
)
|
|
|
</if>
|
|
|
|