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

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusBlq.java

@@ -41,6 +41,9 @@ public class BusBlq extends BaseEntity{
     @Length(min = 1, max = 100, message = "【行别】长度必须介于 {min} 和 {max} 之间")
     private String xingbie;
 
+    @ApiModelProperty(value = "行别")
+    private String xingbieText;
+
     @ApiModelProperty(value = "支柱号")
     @Length(min = 1, max = 50, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
     private String pillarCode;

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusDmcgyq.java

@@ -41,9 +41,12 @@ public class BusDmcgyq extends BaseEntity{
     @Length(min = 1, max = 50, message = "【行别】长度必须介于 {min} 和 {max} 之间")
     private String xingbie;
 
-    @ApiModelProperty(value = "支柱号")
-    @Length(min = 1, max = 10, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
-    private String pillarCode;
+    @ApiModelProperty(value = "行别")
+    private String xingbieText;
+
+    @ApiModelProperty(value = "支柱范围")
+    @Length(min = 1, max = 50, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
+    private String pillarArea;
 
     @ApiModelProperty(value = "股道")
     @Length(min = 1, max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusFdfxjyq.java

@@ -42,6 +42,9 @@ public class BusFdfxjyq extends BaseEntity{
     @Length(min = 1, max = 50, message = "【行别】长度必须介于 {min} 和 {max} 之间")
     private String xingbie;
 
+    @ApiModelProperty(value = "行别")
+    private String xingbieText;
+
     @ApiModelProperty(value = "支柱号范围")
     @Length(min = 1, max = 50, message = "【支柱号范围】长度必须介于 {min} 和 {max} 之间")
     private String pillarArea;

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusGlkg.java

@@ -43,6 +43,9 @@ public class BusGlkg extends BaseEntity{
     @Length(min = 1, max = 100, message = "【行别】长度必须介于 {min} 和 {max} 之间")
     private String xingbie;
 
+    @ApiModelProperty(value = "行别")
+    private String xingbieText;
+
     @ApiModelProperty(value = "支柱号")
     @Length(min = 1, max = 100, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
     private String pillarCode;

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusJcxc.java

@@ -41,9 +41,12 @@ public class BusJcxc extends BaseEntity{
     @Length(min = 1, max = 50, message = "【行别】长度必须介于 {min} 和 {max} 之间")
     private String xingbie;
 
-    @ApiModelProperty(value = "支柱号")
-    @Length(min = 1, max = 10, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
-    private String pillarCode;
+    @ApiModelProperty(value = "行别")
+    private String xingbieText;
+
+    @ApiModelProperty(value = "支柱范围")
+    @Length(min = 1, max = 50, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
+    private String pillarArea;
 
     @ApiModelProperty(value = "股道")
     @Length(min = 1, max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusLine.java

@@ -36,6 +36,9 @@ public class BusLine extends BaseEntity {
   @Length(min = 1, max = 4, message = "【行别】长度必须介于 {min} 和 {max} 之间")
   private String xingbie;
 
+  @ApiModelProperty(value = "行别")
+  private String xingbieText;
+
   @ApiModelProperty(value = "速度等级")
   @Length(min = 1, max = 20, message = "【速度等级】长度必须介于 {min} 和 {max} 之间")
   private String lineSddj;

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusPrevent.java

@@ -20,6 +20,9 @@ public class BusPrevent {
     @ApiModelProperty(value = "行别")
     private String xingbie;
 
+    @ApiModelProperty(value = "行别")
+    private String xingbieText;
+
     @ApiModelProperty(value = "场站ID")
     private String stationId;
 

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusStation.java

@@ -34,6 +34,9 @@ public class BusStation extends BaseEntity {
   @Length(min = 1, max = 4, message = "【行别】长度必须介于 {min} 和 {max} 之间")
   private String xingbie;
 
+  @ApiModelProperty(value = "行别")
+  private String xingbieText;
+
   @ApiModelProperty(value = "区间站场名称")
   @Length(min = 1, max = 64, message = "【区间站场名称】长度必须介于 {min} 和 {max} 之间")
   private String stationName;

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusWjcxc.java

@@ -41,9 +41,12 @@ public class BusWjcxc extends BaseEntity{
     @Length(min = 1, max = 50, message = "【行别】长度必须介于 {min} 和 {max} 之间")
     private String xingbie;
 
-    @ApiModelProperty(value = "支柱号")
-    @Length(min = 1, max = 10, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
-    private String pillarCode;
+    @ApiModelProperty(value = "行别")
+    private String xingbieText;
+
+    @ApiModelProperty(value = "支柱范围")
+    @Length(min = 1, max = 50, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
+    private String pillarArea;
 
     @ApiModelProperty(value = "股道")
     @Length(min = 1, max = 100, message = "【股道】长度必须介于 {min} 和 {max} 之间")

railway-business/src/main/java/com/railway/business/baseinfo/domain/BusZzdzxx.java

@@ -42,6 +42,9 @@ public class BusZzdzxx extends BaseEntity{
     @Length(min = 1, max = 50, message = "【行别】长度必须介于 {min} 和 {max} 之间")
     private String xingbie;
 
+    @ApiModelProperty(value = "行别")
+    private String xingbieText;
+
     @ApiModelProperty(value = "支柱号")
     @Length(min = 1, max = 10, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
     private String pillarCode;

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbDmcgyq.java

@@ -44,6 +44,9 @@ public class BusJcbDmcgyq extends BaseEntity{
     @Length(min = 1, max = 10, message = "【行别】长度必须介于 {min} 和 {max} 之间")
     private String xingbie;
 
+    @ApiModelProperty(value = "行别")
+    private String xingbieText;
+
     @ApiModelProperty(value = "支柱号范围")
     private Integer pillarArea;
 

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcbGlkg.java

@@ -40,6 +40,9 @@ public class BusJcbGlkg extends BaseEntity{
     @Length(min = 1, max = 100, message = "【行别】长度必须介于 {min} 和 {max} 之间")
     private String xingbie;
 
+    @ApiModelProperty(value = "行别")
+    private String xingbieText;
+
     @ApiModelProperty(value = "支柱号")
     @Length(min = 1, max = 100, message = "【支柱号】长度必须介于 {min} 和 {max} 之间")
     private String pillarCode;

railway-business/src/main/java/com/railway/business/catenary/domain/BusJceb.java

@@ -42,6 +42,9 @@ public class BusJceb extends BaseEntity{
     @Length(min = 1, max = 10, message = "【行别】长度必须介于 {min} 和 {max} 之间")
     private String xingbie;
 
+    @ApiModelProperty(value = "行别")
+    private String xingbieText;
+
     @ApiModelProperty(value = "检查日期")
     private Date operationDate;
 

railway-business/src/main/java/com/railway/business/catenary/domain/BusJcebLbjghjl.java

@@ -46,8 +46,4 @@ public class BusJcebLbjghjl extends BusJceb{
     @Length(min = 1, max = 100, message = "【更换原因】长度必须介于 {min} 和 {max} 之间")
     private String ghyy;
 
-    @ApiModelProperty(value = "更换时间")
-    @Length(min = 1, max = 10, message = "【更换时间】长度必须介于 {min} 和 {max} 之间")
-    private String ghsj;
-
 }

railway-business/src/main/java/com/railway/business/catenary/domain/vo/BusJlgzQueryVo.java

@@ -20,6 +20,9 @@ public class BusJlgzQueryVo implements Serializable {
     @ApiModelProperty(value = "行别")
     private String xingbie;
 
+    @ApiModelProperty(value = "行别")
+    private String xingbieText;
+
     @ApiModelProperty(value = "支柱号")
     private String pillarCode;
 

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

@@ -12,6 +12,7 @@
     <result column="station_id" property="stationId"/>
     <result column="station_name" property="stationName"/>
     <result column="xingbie" property="xingbie"/>
+    <result column="xingbie_text" property="xingbieText"/>
     <result column="pillar_code" property="pillarCode"/>
     <result column="marker" property="marker"/>
     <result column="station_track" property="stationTrack"/>
@@ -680,17 +681,19 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     WHERE t.del_flag='0' and t.id = #{id}
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

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

@@ -13,7 +13,8 @@
     <result column="station_id" property="stationId"/>
     <result column="station_name" property="stationName"/>
     <result column="xingbie" property="xingbie"/>
-    <result column="pillar_code" property="pillarCode"/>
+    <result column="xingbie_text" property="xingbieText"/>
+    <result column="pillar_area" property="pillarArea"/>
     <result column="station_track" property="stationTrack"/>
     <result column="gxms" property="gxms"/>
     <result column="fxcs" property="fxcs"/>
@@ -44,7 +45,7 @@
     v.station_name as station_name,
     t.station_id,
     t.xingbie,
-    t.pillar_code,
+    t.pillar_area,
     t.station_track,
     t.gxms,
     t.fxcs,
@@ -76,8 +77,8 @@
       <if test='null != xingbie'>
         xingbie,
       </if>
-      <if test='null != pillarCode'>
-        pillar_code,
+      <if test='null != pillarArea'>
+        pillar_area,
       </if>
       <if test='null != stationTrack'>
         station_track,
@@ -138,8 +139,8 @@
       <if test='null != xingbie'>
         #{xingbie},
       </if>
-      <if test='null != pillarCode'>
-        #{pillarCode},
+      <if test='null != pillarArea'>
+        #{pillarArea},
       </if>
       <if test='null != stationTrack'>
         #{stationTrack},
@@ -206,7 +207,7 @@
     <set>
       <if test='null != stationId'>station_id = #{stationId},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
-      <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
+      <if test='null != pillarArea'>pillar_area = #{pillarArea},</if>
       <if test='null != stationTrack'>station_track = #{stationTrack},</if>
       <if test='null != gxms'>gxms = #{gxms},</if>
       <if test='null != fxcs'>fxcs = #{fxcs},</if>
@@ -231,18 +232,20 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">
@@ -257,8 +260,8 @@
       <if test="xingbie!=null and xingbie!=''">
         and t.xingbie=#{xingbie}
       </if>
-      <if test="pillarCode!=null and pillarCode!=''">
-        and t.pillar_code=#{pillarCode}
+      <if test="pillarArea!=null and pillarArea!=''">
+        and t.pillar_area=#{pillarArea}
       </if>
       <if test="stationTrack!=null and stationTrack!=''">
         and t.station_track=#{stationTrack}

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

@@ -12,6 +12,7 @@
     <result column="station_id" property="stationId"/>
     <result column="station_name" property="stationName"/>
     <result column="xingbie" property="xingbie"/>
+    <result column="xingbie_text" property="xingbieText"/>
     <result column="pillar_area" property="pillarArea"/>
     <result column="station_track" property="stationTrack"/>
     <result column="gxms" property="gxms"/>
@@ -395,7 +396,7 @@
     <set>
       <if test='null != stationId'>station_id = #{stationId},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
-      <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
+      <if test='null != pillarArea'>pillar_area = #{pillarArea},</if>
       <if test='null != marker'>marker = #{marker},</if>
       <if test='null != stationTrack'>station_track = #{stationTrack},</if>
       <if test='null != gxms'>gxms = #{gxms},</if>
@@ -444,18 +445,20 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

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

@@ -12,6 +12,7 @@
     <result column="station_id" property="stationId"/>
     <result column="station_name" property="stationName"/>
     <result column="xingbie" property="xingbie"/>
+    <result column="xingbie_text" property="xingbieText"/>
     <result column="pillar_code" property="pillarCode"/>
     <result column="marker" property="marker"/>
     <result column="kgbh" property="kgbh"/>
@@ -156,18 +157,19 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     WHERE t.del_flag='0' and t.id = #{id}
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
-    FROM
-    base_glkg t
+    <include refid="Base_Column_List"/>, d.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')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

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

@@ -12,7 +12,8 @@
     <result column="station_id" property="stationId"/>
     <result column="station_name" property="stationName"/>
     <result column="xingbie" property="xingbie"/>
-    <result column="pillar_code" property="pillarCode"/>
+    <result column="xingbie_text" property="xingbieText"/>
+    <result column="pillar_area" property="pillarArea"/>
     <result column="marker" property="marker"/>
     <result column="station_track" property="stationTrack"/>
     <result column="gxms" property="gxms"/>
@@ -38,7 +39,7 @@
     v.station_name as station_name,
     t.station_id,
     t.xingbie,
-    t.pillar_code,
+    t.pillar_area,
     t.marker,
     t.station_track,
     t.gxms,
@@ -67,8 +68,8 @@
       <if test='null != xingbie'>
         xingbie,
       </if>
-      <if test='null != pillarCode'>
-        pillar_code,
+      <if test='null != pillarArea'>
+        pillar_area,
       </if>
       <if test='null != stationTrack'>
         station_track,
@@ -120,8 +121,8 @@
       <if test='null != xingbie'>
         #{xingbie},
       </if>
-      <if test='null != pillarCode'>
-        #{pillarCode},
+      <if test='null != pillarArea'>
+        #{pillarArea},
       </if>
       <if test='null != stationTrack'>
         #{stationTrack},
@@ -179,7 +180,7 @@
     <set>
       <if test='null != stationId'>station_id = #{stationId},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
-      <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
+      <if test='null != pillarArea'>pillar_area = #{pillarArea},</if>
       <if test='null != marker'>marker = #{marker},</if>
       <if test='null != stationTrack'>station_track = #{stationTrack},</if>
       <if test='null != gxms'>gxms = #{gxms},</if>
@@ -201,18 +202,20 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">
@@ -227,8 +230,8 @@
       <if test="xingbie!=null and xingbie!=''">
         and t.xingbie=#{xingbie}
       </if>
-      <if test="pillarCode!=null and pillarCode!=''">
-        and t.pillar_code=#{pillarCode}
+      <if test="pillarArea!=null and pillarArea!=''">
+        and t.pillar_area=#{pillarArea}
       </if>
       <if test="marker!=null and marker!=''">
         and t.marker=#{marker}

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

@@ -10,6 +10,7 @@
     <result column="dept_name" property="deptName"/>
     <result column="line_name" property="lineName"/>
     <result column="xingbie" property="xingbie"/>
+    <result column="xingbie_text" property="xingbieText"/>
     <result column="line_sddj" property="lineSddj"/>
     <result column="line_type" property="lineType"/>
     <result column="line_dj" property="lineDj"/>
@@ -238,20 +239,22 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     WHERE t.del_flag='0' and t.line_id = #{lineId}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">

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

@@ -10,6 +10,7 @@
     <result column="line_id" property="lineId"/>
     <result column="line_name" property="lineName"/>
     <result column="xingbie" property="xingbie"/>
+    <result column="xingbie_text" property="xingbieText"/>
     <result column="station_name" property="stationName"/>
     <result column="station_type" property="stationType"/>
     <result column="qjlc" property="qjlc"/>
@@ -25,24 +26,24 @@
   </resultMap>
 
   <sql id="Base_Column_List">
-    station_id,
-    dept_id,
-    dept_name,
-    line_id,
-    line_name,
-    xingbie,
-    station_name,
-    station_type,
-    qjlc,
-    start_marker,
-    end_marker,
-    dhgds,
-    order_num,
-    del_flag,
-    create_by,
-    create_time,
-    update_by,
-    update_time
+    t.station_id,
+    t.dept_id,
+    t.dept_name,
+    t.line_id,
+    t.line_name,
+    t.xingbie,
+    t.station_name,
+    t.station_type,
+    t.qjlc,
+    t.start_marker,
+    t.end_marker,
+    t.dhgds,
+    t.order_num,
+    t.del_flag,
+    t.create_by,
+    t.create_time,
+    t.update_by,
+    t.update_time
   </sql>
 
   <insert id="insert" parameterType="com.railway.business.baseinfo.domain.BusStation">
@@ -177,68 +178,70 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
-    FROM base_station
+    <include refid="Base_Column_List"/>, d.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')
     WHERE del_flag='0' and station_id = #{stationId}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
-    FROM base_station
+    <include refid="Base_Column_List"/>, d.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')
     <where>
-      del_flag='0'
+      t.del_flag='0'
       <if test="deptId!=null and deptId!=''">
-        and dept_id=#{deptId}
+        and  t.dept_id=#{deptId}
       </if>
       <if test="deptName!=null and deptName!=''">
-        and dept_name=#{deptName}
+        and  t.dept_name=#{deptName}
       </if>
       <if test="lineId!=null and lineId!=''">
-        and line_id=#{lineId}
+        and  t.line_id=#{lineId}
       </if>
       <if test="lineName!=null and lineName!=''">
-        and line_name=#{lineName}
+        and  t.line_name=#{lineName}
       </if>
       <if test="xingbie!=null and xingbie!=''">
-        and xingbie=#{xingbie}
+        and  t.xingbie=#{xingbie}
       </if>
       <if test="stationName!=null and stationName!=''">
-        and station_name=#{stationName}
+        and  t.station_name=#{stationName}
       </if>
       <if test="stationType!=null and stationType!=''">
-        and station_type=#{stationType}
+        and  t.station_type=#{stationType}
       </if>
       <if test="qjlc!=null and qjlc!=''">
-        and qjlc=#{qjlc}
+        and  t.qjlc=#{qjlc}
       </if>
       <if test="startMarker!=null and startMarker!=''">
-        and start_marker=#{startMarker}
+        and  t.start_marker=#{startMarker}
       </if>
       <if test="endMarker!=null and endMarker!=''">
-        and end_marker=#{endMarker}
+        and  t.end_marker=#{endMarker}
       </if>
       <if test="dhgds!=null and dhgds!=''">
-        and dhgds=#{dhgds}
+        and  t.dhgds=#{dhgds}
       </if>
       <if test="orderNum!=null and orderNum!=''">
-        and order_num=#{orderNum}
+        and  t.order_num=#{orderNum}
       </if>
       <if test="delFlag!=null and delFlag!=''">
-        and del_flag=#{delFlag}
+        and  t.del_flag=#{delFlag}
       </if>
       <if test="createBy!=null and createBy!=''">
-        and create_by=#{createBy}
+        and  t.create_by=#{createBy}
       </if>
       <if test="createTime!=null and createTime!=''">
-        and create_time=#{createTime}
+        and  t.create_time=#{createTime}
       </if>
       <if test="updateBy!=null and updateBy!=''">
-        and update_by=#{updateBy}
+        and  t.update_by=#{updateBy}
       </if>
       <if test="updateTime!=null and updateTime!=''">
-        and update_time=#{updateTime}
+        and  t.update_time=#{updateTime}
       </if>
     </where>
   </select>

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

@@ -12,7 +12,8 @@
     <result column="station_id" property="stationId"/>
     <result column="station_name" property="stationName"/>
     <result column="xingbie" property="xingbie"/>
-    <result column="pillar_code" property="pillarCode"/>
+    <result column="xingbie_text" property="xingbieText"/>
+    <result column="pillar_area" property="pillarArea"/>
     <result column="station_track" property="stationTrack"/>
     <result column="gxms" property="gxms"/>
     <result column="dcbh" property="dcbh"/>
@@ -35,7 +36,7 @@
     v.station_name as station_name,
     t.station_id,
     t.xingbie,
-    t.pillar_code,
+    t.pillar_area,
     t.station_track,
     t.gxms,
     t.dcbh,
@@ -61,8 +62,8 @@
       <if test='null != xingbie'>
         xingbie,
       </if>
-      <if test='null != pillarCode'>
-        pillar_code,
+      <if test='null != pillarArea'>
+        pillar_area,
       </if>
       <if test='null != stationTrack'>
         station_track,
@@ -105,8 +106,8 @@
       <if test='null != xingbie'>
         #{xingbie},
       </if>
-      <if test='null != pillarCode'>
-        #{pillarCode},
+      <if test='null != pillarArea'>
+        #{pillarArea},
       </if>
       <if test='null != stationTrack'>
         #{stationTrack},
@@ -155,7 +156,7 @@
     <set>
       <if test='null != stationId'>station_id = #{stationId},</if>
       <if test='null != xingbie'>xingbie = #{xingbie},</if>
-      <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
+      <if test='null != pillarArea'>pillar_area = #{pillarArea},</if>
       <if test='null != stationTrack'>station_track = #{stationTrack},</if>
       <if test='null != gxms'>gxms = #{gxms},</if>
       <if test='null != dcbh'>dcbh = #{dcbh},</if>
@@ -174,18 +175,20 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     <where>
       t.del_flag='0'
       <if test="deptId!=null and deptId!=''">
@@ -200,8 +203,8 @@
       <if test="xingbie!=null and xingbie!=''">
         and t.xingbie=#{xingbie}
       </if>
-      <if test="pillarCode!=null and pillarCode!=''">
-        and t.pillar_code=#{pillarCode}
+      <if test="pillarArea!=null and pillarArea!=''">
+        and t.pillar_area=#{pillarArea}
       </if>
       <if test="stationTrack!=null and stationTrack!=''">
         and t.station_track=#{stationTrack}

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

@@ -12,6 +12,7 @@
     <result column="station_id" property="stationId"/>
     <result column="station_name" property="stationName"/>
     <result column="xingbie" property="xingbie"/>
+    <result column="xingbie_text" property="xingbieText"/>
     <result column="pillar_code" property="pillarCode"/>
     <result column="station_track" property="stationTrack"/>
     <result column="gxms" property="gxms"/>
@@ -683,18 +684,20 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     <where>
       t.del_flag='0'
       <if test="stationId!=null and stationId!=''">

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

@@ -11,6 +11,7 @@
     <result column="station_name" property="stationName"/>
     <result column="fenxiang" property="fenxiang"/>
     <result column="xingbie" property="xingbie"/>
+    <result column="xingbie_text" property="xingbieText"/>
     <result column="pillar_area" property="pillarArea"/>
     <result column="tianqi" property="tianqi"/>
     <result column="temperature" property="temperature"/>
@@ -313,9 +314,10 @@
 
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     WHERE t.del_flag='0' and t.id = #{id}
 
   </select>
@@ -336,9 +338,10 @@
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    <include refid="Base_Column_List"/>
+    <include refid="Base_Column_List"/>, d.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')
     <where>
       t.del_flag='0'
       <if test="stationId!=null and stationId!=''">

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

@@ -10,6 +10,7 @@
     <result column="station_id" property="stationId"/>
     <result column="station_name" property="stationName"/>
     <result column="xingbie" property="xingbie"/>
+    <result column="xingbie_text" property="xingbieText"/>
     <result column="pillar_code" property="pillarCode"/>
     <result column="kgh" property="kgh"/>
     <result column="temperature" property="temperature"/>
@@ -693,10 +694,11 @@
     SELECT
     distinct
     s.station_name,
-    a.*
+    a.*, d.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')
     WHERE
     a.del_flag = '0'
     AND s.del_flag = '0'
@@ -706,10 +708,11 @@
   <select id="getList" resultMap="BaseResultMap">
     SELECT
     s.station_name,
-    a.*
+    a.*, d.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')
     <where>
       a.del_flag = '0'
       AND s.del_flag = '0'

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

@@ -15,7 +15,7 @@
     <result column="ghh_ggxh" property="ghhGgxh"/>
     <result column="ghh_sccj" property="ghhSccj"/>
     <result column="ghyy" property="ghyy"/>
-    <result column="ghsj" property="ghsj"/>
+    <result column="operation_date" property="operationDate"/>
     <result column="operator" property="operator"/>
     <result column="remark" property="remark"/>
     <result column="submit_state" property="submitState"/>
@@ -38,7 +38,7 @@
     ghh_ggxh,
     ghh_sccj,
     ghyy,
-    ghsj,
+    operation_date,
     operator,
     remark,
     submit_state,
@@ -82,8 +82,8 @@
       <if test='null != ghyy'>
         ghyy,
       </if>
-      <if test='null != ghsj'>
-        ghsj,
+      <if test='null != operationDate'>
+        operation_date,
       </if>
       <if test='null != operator'>
         operator,
@@ -138,8 +138,8 @@
       <if test='null != ghyy'>
         #{ghyy},
       </if>
-      <if test='null != ghsj'>
-        #{ghsj},
+      <if test='null != operationDate'>
+        #{operationDate},
       </if>
       <if test='null != operator'>
         #{operator},
@@ -186,7 +186,7 @@
       <if test='null != ghhGgxh'>ghh_ggxh = #{ghhGgxh},</if>
       <if test='null != ghhSccj'>ghh_sccj = #{ghhSccj},</if>
       <if test='null != ghyy'>ghyy = #{ghyy},</if>
-      <if test='null != ghsj'>ghsj = #{ghsj},</if>
+      <if test='null != operationDate'>operation_date = #{operationDate},</if>
       <if test='null != operator'>operator = #{operator},</if>
       <if test='null != remark'>remark = #{remark},</if>
       <if test='null != submitState'>submit_state = #{submitState},</if>
@@ -248,8 +248,8 @@
       <if test="ghyy!=null and ghyy!=''">
         and a.ghyy=#{ghyy}
       </if>
-      <if test="ghsj!=null and ghsj!=''">
-        and a.ghsj=#{ghsj}
+      <if test="operationDate!=null and operationDate!=''">
+        and a.operation_date=#{operationDate}
       </if>
       <if test="operator!=null and operator!=''">
         and a.operator=#{operator}
@@ -276,7 +276,7 @@
         and a.update_time=#{updateTime}
       </if>
     </where>
-    order by str_to_date(a.ghsj,'%Y-%m-%d') desc
+    order by a.operation_date desc
   </select>
 
   <resultMap id="JcebResultMap" type="com.railway.business.catenary.domain.vo.JcebRecordVo">