|
|
@@ -222,6 +222,8 @@
|
|
|
|
|
|
SELECT
|
|
|
a.id,
|
|
|
+ v.dept_id,
|
|
|
+ v.dept_name,
|
|
|
v.line_name,
|
|
|
v.station_name,
|
|
|
a.qsgh,
|
|
|
@@ -229,10 +231,12 @@
|
|
|
a.station_id,
|
|
|
a.xingbie,
|
|
|
a.fjlx,
|
|
|
+ dict1.dict_label as xingbie_text,
|
|
|
dict2.dict_label AS fjlx_text,
|
|
|
${query.pillarArea} AS pillar_area
|
|
|
FROM base_fjxgmd a
|
|
|
LEFT JOIN v_station v ON a.station_id = v.dept_station_id
|
|
|
+ LEFT JOIN sys_dict_data dict1 ON (a.xingbie = dict1.dict_value AND dict1.dict_type = 'xingbie')
|
|
|
LEFT JOIN sys_dict_data dict2 ON (a.fjlx = dict2.dict_value AND dict2.dict_type = 'fjlx')
|
|
|
WHERE a.del_flag = '0'
|
|
|
<if test="query.lineId != null and query.lineId != ''">
|
fenghao