【CHG】修改线岔反查SQL

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

@@ -47,7 +47,7 @@ public class BusJcbJcxc extends BaseEntity{
 
     @ApiModelProperty(value = "线岔号")
     @Length(min = 1, max = 30, message = "【线岔号】长度必须介于 {min} 和 {max} 之间")
-    private String xianchahao;
+    private String jcxcId;
 
     @ApiModelProperty(value = "温度")
     @Length(min = 1, max = 20, message = "【温度】长度必须介于 {min} 和 {max} 之间")

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

@@ -47,7 +47,7 @@ public class BusJcbWjcxc extends BaseEntity{
 
     @ApiModelProperty(value = "线岔号")
     @Length(min = 1, max = 30, message = "【线岔号】长度必须介于 {min} 和 {max} 之间")
-    private String xianchahao;
+    private String jcxcId;
 
     @ApiModelProperty(value = "温度")
     @Length(min = 1, max = 20, message = "【温度】长度必须介于 {min} 和 {max} 之间")

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

@@ -11,7 +11,7 @@
     <result column="station_name" property="stationName"/>
     <result column="dept_station_id" property="deptStationId"/>
     <result column="pillar_code" property="pillarCode"/>
-    <result column="xianchahao" property="xianchahao"/>
+    <result column="jcxc_id" property="jcxcId"/>
     <result column="temperature" property="temperature"/>
     <result column="check_date" property="checkDate"/>
     <result column="gz1lcz" property="gz1lcz"/>
@@ -65,7 +65,7 @@
     v.station_id,
     t1.dept_station_id,
     t1.pillar_area pillar_code,
-    t.xianchahao,
+    t.jcxc_id,
     t.temperature,
     t.check_date,
     t.gz1lcz,
@@ -120,8 +120,8 @@
       <if test='null != pillarCode'>
         pillar_code,
       </if>
-      <if test='null != xianchahao'>
-        xianchahao,
+      <if test='null != jcxcId'>
+        jcxc_id,
       </if>
       <if test='null != temperature'>
         temperature,
@@ -257,8 +257,8 @@
       <if test='null != pillarCode'>
         #{pillarCode},
       </if>
-      <if test='null != xianchahao'>
-        #{xianchahao},
+      <if test='null != jcxcId'>
+        #{jcxcId},
       </if>
       <if test='null != temperature'>
         #{temperature},
@@ -400,7 +400,7 @@
     <set>
       <if test='null != deptStationId'>dept_station_id = #{deptStationId},</if>
       <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
-      <if test='null != xianchahao'>xianchahao = #{xianchahao},</if>
+      <if test='null != jcxcId'>jcxc_id = #{jcxcId},</if>
       <if test='null != temperature'>temperature = #{temperature},</if>
       <if test='null != checkDate'>check_date = #{checkDate},</if>
       <if test='null != gz1lcz'>gz1lcz = #{gz1lcz},</if>
@@ -450,7 +450,7 @@
     SELECT
     <include refid="Base_Column_List"/>
     FROM bus_jcb_jcxc t
-    LEFT JOIN base_jcxc t1 on t.xianchahao = t1.id
+    LEFT JOIN base_jcxc t1 on t.jcxc_id = t1.id
     LEFT JOIN v_station v on t1.dept_station_id = v.dept_station_id
     WHERE t.del_flag='0' and t.id = #{id}
 
@@ -474,7 +474,7 @@
     SELECT
     <include refid="Base_Column_List"/>
     FROM bus_jcb_jcxc t
-    LEFT JOIN base_jcxc t1 on t.xianchahao = t1.id
+    LEFT JOIN base_jcxc t1 on t.jcxc_id = t1.id
     LEFT JOIN v_station v on t1.dept_station_id = v.dept_station_id
     <where>
       t.del_flag='0'
@@ -484,8 +484,8 @@
       <if test="pillarCode!=null and pillarCode!=''">
         and t1.pillar_code=#{pillarCode}
       </if>
-      <if test="xianchahao!=null and xianchahao!=''">
-        and t.xianchahao=#{xianchahao}
+      <if test="jcxcId!=null and jcxcId!=''">
+        and t.jcxc_id=#{jcxcId}
       </if>
       <if test="temperature!=null and temperature!=''">
         and t.temperature=#{temperature}

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

@@ -11,7 +11,7 @@
     <result column="station_name" property="stationName"/>
     <result column="dept_station_id" property="deptStationId"/>
     <result column="pillar_code" property="pillarCode"/>
-    <result column="xianchahao" property="xianchahao"/>
+    <result column="jcxc_id" property="jcxcId"/>
     <result column="temperature" property="temperature"/>
     <result column="check_date" property="checkDate"/>
     <result column="lbjzt" property="lbjzt"/>
@@ -55,11 +55,11 @@
     t.id,
     v.dept_id,
     v.dept_name,
-    v.station_name as station_name,
+    v.station_name,
     v.station_id,
     t1.dept_station_id,
     t1.pillar_area pillar_code,
-    t.xianchahao,
+    t.jcxc_id,
     t.temperature,
     t.check_date,
     t.lbjzt,
@@ -108,8 +108,8 @@
       <if test='null != pillarCode'>
         pillar_code,
       </if>
-      <if test='null != xianchahao'>
-        xianchahao,
+      <if test='null != jcxcId'>
+        jcxc_id,
       </if>
       <if test='null != temperature'>
         temperature,
@@ -227,8 +227,8 @@
       <if test='null != pillarCode'>
         #{pillarCode},
       </if>
-      <if test='null != xianchahao'>
-        #{xianchahao},
+      <if test='null != jcxcId'>
+        #{jcxcId},
       </if>
       <if test='null != temperature'>
         #{temperature},
@@ -352,7 +352,7 @@
     <set>
       <if test='null != deptStationId'>dept_station_id = #{deptStationId},</if>
       <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
-      <if test='null != xianchahao'>xianchahao = #{xianchahao},</if>
+      <if test='null != jcxcId'>jcxc_id = #{jcxcId},</if>
       <if test='null != temperature'>temperature = #{temperature},</if>
       <if test='null != checkDate'>check_date = #{checkDate},</if>
       <if test='null != lbjzt'>lbjzt = #{lbjzt},</if>
@@ -396,7 +396,7 @@
     SELECT
     <include refid="Base_Column_List"/>
     FROM bus_jcb_wjcxc t
-    LEFT JOIN base_jcxc t1 on t.xianchahao = t1.id
+    LEFT JOIN base_jcxc t1 on t.jcxc_id = t1.id
     LEFT JOIN v_station v on t1.dept_station_id = v.dept_station_id
     WHERE t.del_flag='0' and t.id = #{id}
 
@@ -421,7 +421,7 @@
     SELECT
     <include refid="Base_Column_List"/>
     FROM bus_jcb_wjcxc t
-    LEFT JOIN base_jcxc t1 on t.xianchahao = t1.id
+    LEFT JOIN base_jcxc t1 on t.jcxc_id = t1.id
     LEFT JOIN v_station v on t1.dept_station_id = v.dept_station_id
     <where>
       t.del_flag='0'
@@ -431,8 +431,8 @@
       <if test="pillarCode!=null and pillarCode!=''">
         and t1.pillar_code=#{pillarCode}
       </if>
-      <if test="xianchahao!=null and xianchahao!=''">
-        and t.xianchahao=#{xianchahao}
+      <if test="jcxcId!=null and jcxcId!=''">
+        and t.jcxc_id=#{jcxcId}
       </if>
       <if test="temperature!=null and temperature!=''">
         and t.temperature=#{temperature}