【CHG】有行别的返回参数中增加行别中文名

railway-business/src/main/resources/mapper/baseinfo/BusBlqMapper.xml

@@ -681,19 +681,19 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_blq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_blq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

railway-business/src/main/resources/mapper/baseinfo/BusDmcgyqMapper.xml

@@ -232,20 +232,20 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_dmcgyq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_dmcgyq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

railway-business/src/main/resources/mapper/baseinfo/BusFdfxjyqMapper.xml

@@ -445,20 +445,20 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_fdfxjyq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_fdfxjyq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

railway-business/src/main/resources/mapper/baseinfo/BusGlkgMapper.xml

@@ -157,19 +157,19 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_glkg t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_glkg t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

railway-business/src/main/resources/mapper/baseinfo/BusJcxcMapper.xml

@@ -202,20 +202,20 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_jcxc t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_jcxc t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

railway-business/src/main/resources/mapper/baseinfo/BusLineMapper.xml

@@ -239,22 +239,22 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_line t
     left join sys_dept d on t.dept_id = d.dept_id
     left join sys_dept d1 on d.parent_id = d1.dept_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.line_id = #{lineId}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_line t
     left join sys_dept d on t.dept_id = d.dept_id
     left join sys_dept d1 on d.parent_id = d1.dept_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

railway-business/src/main/resources/mapper/baseinfo/BusStationMapper.xml

@@ -178,18 +178,18 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_station t
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE del_flag='0' and station_id = #{stationId}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_station t
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

railway-business/src/main/resources/mapper/baseinfo/BusWjcxcMapper.xml

@@ -175,20 +175,20 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_wjcxc t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_wjcxc t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

railway-business/src/main/resources/mapper/baseinfo/BusZzdzxxMapper.xml

@@ -684,20 +684,20 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_pillar t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM base_pillar t
     left join v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="stationId!=null and stationId!=''">

railway-business/src/main/resources/mapper/catenary/BusJcbDmcgyqMapper.xml

@@ -314,10 +314,10 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM bus_jcb_dmcgyq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
@@ -338,10 +338,10 @@
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>, d.dict_label as xingbie_text
+    <include refid="Base_Column_List"/>, dict.dict_label as xingbie_text
     FROM bus_jcb_dmcgyq t
     LEFT JOIN v_station v on t.station_id = v.station_id
-    LEFT JOIN sys_dict_data d ON (t.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (t.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       t.del_flag='0'
       <if test="stationId!=null and stationId!=''">

railway-business/src/main/resources/mapper/catenary/BusJcbGlkgMapper.xml

@@ -694,11 +694,11 @@
     SELECT
     distinct
     s.station_name,
-    a.*, d.dict_label as xingbie_text
+    a.*, dict.dict_label as xingbie_text
     FROM
     bus_jcb_glkg a
     LEFT JOIN base_station s ON a.station_id = s.station_id
-    LEFT JOIN sys_dict_data d ON (a.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_data dict ON (a.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     WHERE
     a.del_flag = '0'
     AND s.del_flag = '0'
@@ -708,11 +708,11 @@
   <select id="getList" resultMap="BaseResultMap">
     SELECT
     s.station_name,
-    a.*, d.dict_label as xingbie_text
+    a.*, dict.dict_label as xingbie_text
     FROM
     bus_jcb_glkg a
     LEFT JOIN base_station s ON a.station_id = s.station_id
-    LEFT JOIN sys_dict_data d ON (a.xingbie = d.dict_value AND d.dict_type = 'xingbie')
+    LEFT JOIN sys_dict_datadict ON (a.xingbie = dict.dict_value AND dict.dict_type = 'xingbie')
     <where>
       a.del_flag = '0'
       AND s.del_flag = '0'