|
|
@@ -144,11 +144,9 @@
|
|
|
<select id="getInfo" resultMap="BaseResultMap">
|
|
|
SELECT
|
|
|
DISTINCT
|
|
|
- line.line_name,
|
|
|
- v.substation_name,
|
|
|
+ <include refid="Base_Column_List"/> ,
|
|
|
dict1.dict_label as xingbie_text,
|
|
|
- dict2.dict_label as yylx_text,
|
|
|
- <include refid="Base_Column_List"/>
|
|
|
+ dict2.dict_label as yylx_text
|
|
|
FROM
|
|
|
base_jlgz t
|
|
|
LEFT JOIN v_substation v ON a.substation_id = v.substation_id
|
|
|
@@ -161,14 +159,12 @@
|
|
|
|
|
|
<select id="getList" resultMap="BaseResultMap">
|
|
|
SELECT
|
|
|
- v.line_name,
|
|
|
- v.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_substation v ON t.substation_id = v.substation_id
|
|
|
+ LEFT JOIN v_substation v ON t.substation_id = v.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>
|
|
|
@@ -233,8 +229,6 @@
|
|
|
SELECT D.* FROM
|
|
|
(
|
|
|
SELECT
|
|
|
- v.line_name,
|
|
|
- v.substation_name,
|
|
|
dict1.dict_label as xingbie_text,
|
|
|
dict2.dict_label as yylx_text,
|
|
|
<include refid="Base_Column_List"/>
|
