|
|
@@ -244,18 +244,16 @@
|
|
|
SELECT D.* FROM
|
|
|
(
|
|
|
SELECT
|
|
|
- line.line_name,
|
|
|
+ v.line_name,
|
|
|
sub.substation_name,
|
|
|
dict1.dict_label as xingbie_text,
|
|
|
dict2.dict_label as yylx_text,
|
|
|
<include refid="Base_Column_List"/>
|
|
|
FROM base_jlgz t
|
|
|
- LEFT JOIN base_line line ON t.line_id = line.line_id
|
|
|
- LEFT JOIN base_substation sub ON t.substation_id = sub.substation_id
|
|
|
+ LEFT JOIN v_substation sub ON t.substation_id = sub.substation_id
|
|
|
LEFT JOIN sys_dict_data dict1 ON (t.xingbie = dict1.dict_value AND dict1.dict_type = 'xingbie')
|
|
|
LEFT JOIN sys_dict_data dict2 ON (t.yylx = dict2.dict_value AND dict2.dict_type = 'gzyy')
|
|
|
WHERE t.del_flag = '0'
|
|
|
- AND line.del_flag = '0'
|
|
|
AND sub.del_flag = '0'
|
|
|
) D,
|
|
|
(
|
