【CHG】统一部分常见字段和表名

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

@@ -311,7 +311,6 @@
     <set>
       <if test='null != blqId'>blq_id = #{blqId},</if>
       <if test='null != stationId'>station_id = #{stationId},</if>
-      <if test='null != deptId'>dept_id = #{deptId},</if>
       <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
       <if test='null != temperature'>temperature = #{temperature},</if>
       <if test='null != checkDate'>check_date = #{checkDate},</if>

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

@@ -112,11 +112,11 @@
   <insert id="insert" parameterType="com.railway.business.catenary.domain.BusJcbJcxc">
     INSERT INTO bus_jcb_jcxc
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test='null != zhanqujian'>
-        zhanqujian,
+      <if test='null != stationId'>
+        station_id,
       </if>
-      <if test='null != zhizhuhao'>
-        zhizhuhao,
+      <if test='null != pillarCode'>
+        pillar_code,
       </if>
       <if test='null != xianchahao'>
         xianchahao,
@@ -249,11 +249,11 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test='null != zhanqujian'>
-        #{zhanqujian},
+      <if test='null != stationId'>
+        #{stationId},
       </if>
-      <if test='null != zhizhuhao'>
-        #{zhizhuhao},
+      <if test='null != pillarCode'>
+        #{pillarCode},
       </if>
       <if test='null != xianchahao'>
         #{xianchahao},
@@ -396,8 +396,8 @@
   <update id="update" parameterType="com.railway.business.catenary.domain.BusJcbJcxc">
     UPDATE bus_jcb_jcxc
     <set>
-      <if test='null != zhanqujian'>zhanqujian = #{zhanqujian},</if>
-      <if test='null != zhizhuhao'>zhizhuhao = #{zhizhuhao},</if>
+      <if test='null != stationId'>station_id = #{stationId},</if>
+      <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
       <if test='null != xianchahao'>xianchahao = #{xianchahao},</if>
       <if test='null != temperature'>temperature = #{temperature},</if>
       <if test='null != checkDate'>check_date = #{checkDate},</if>

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

@@ -100,11 +100,11 @@
   <insert id="insert" parameterType="com.railway.business.catenary.domain.BusJcbWjcxc">
     INSERT INTO bus_jcb_wjcxc
     <trim prefix="(" suffix=")" suffixOverrides=",">
-      <if test='null != zhanqujian'>
-        zhanqujian,
+      <if test='null != stationId'>
+        station_id,
       </if>
-      <if test='null != zhizhuhao'>
-        zhizhuhao,
+      <if test='null != pillarCode'>
+        pillar_code,
       </if>
       <if test='null != xianchahao'>
         xianchahao,
@@ -219,11 +219,11 @@
       </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
-      <if test='null != zhanqujian'>
-        #{zhanqujian},
+      <if test='null != stationId'>
+        #{stationId},
       </if>
-      <if test='null != zhizhuhao'>
-        #{zhizhuhao},
+      <if test='null != pillarCode'>
+        #{pillarCode},
       </if>
       <if test='null != xianchahao'>
         #{xianchahao},
@@ -348,8 +348,8 @@
   <update id="update" parameterType="com.railway.business.catenary.domain.BusJcbWjcxc">
     UPDATE bus_jcb_wjcxc
     <set>
-      <if test='null != zhanqujian'>zhanqujian = #{zhanqujian},</if>
-      <if test='null != zhizhuhao'>zhizhuhao = #{zhizhuhao},</if>
+      <if test='null != stationId'>station_id = #{stationId},</if>
+      <if test='null != pillarCode'>pillar_code = #{pillarCode},</if>
       <if test='null != xianchahao'>xianchahao = #{xianchahao},</if>
       <if test='null != temperature'>temperature = #{temperature},</if>
       <if test='null != checkDate'>check_date = #{checkDate},</if>
@@ -419,125 +419,126 @@
   <select id="getList" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List"/>
-    FROM bus_jcb_wjcxc
+    FROM bus_jcb_wjcxc t
+    LEFT JOIN v_station v on t.station_id = v.station_id
     <where>
-      del_flag='0'
-      <if test="zhanqujian!=null and zhanqujian!=''">
-        and zhanqujian=#{zhanqujian}
+      t.del_flag='0'
+      <if test="stationId!=null and stationId!=''">
+        and t.station_id=#{stationId}
       </if>
-      <if test="zhizhuhao!=null and zhizhuhao!=''">
-        and zhizhuhao=#{zhizhuhao}
+      <if test="pillarCode!=null and pillarCode!=''">
+        and t.pillar_code=#{pillarCode}
       </if>
       <if test="xianchahao!=null and xianchahao!=''">
-        and xianchahao=#{xianchahao}
+        and t.xianchahao=#{xianchahao}
       </if>
       <if test="temperature!=null and temperature!=''">
-        and temperature=#{temperature}
+        and t.temperature=#{temperature}
       </if>
       <if test="checkDate!=null and checkDate!=''">
-        and check_date=#{checkDate}
+        and t.check_date=#{checkDate}
       </if>
       <if test="lbjzt!=null and lbjzt!=''">
-        and lbjzt=#{lbjzt}
+        and t.lbjzt=#{lbjzt}
       </if>
       <if test="lbjztGzms!=null and lbjztGzms!=''">
-        and lbjzt_gzms=#{lbjztGzms}
+        and t.lbjzt_gzms=#{lbjztGzms}
       </if>
       <if test="zxlcz!=null and zxlcz!=''">
-        and zxlcz=#{zxlcz}
+        and t.zxlcz=#{zxlcz}
       </if>
       <if test="zxdg!=null and zxdg!=''">
-        and zxdg=#{zxdg}
+        and t.zxdg=#{zxdg}
       </if>
       <if test="cxlcz!=null and cxlcz!=''">
-        and cxlcz=#{cxlcz}
+        and t.cxlcz=#{cxlcz}
       </if>
       <if test="cxdg!=null and cxdg!=''">
-        and cxdg=#{cxdg}
+        and t.cxdg=#{cxdg}
       </if>
       <if test="hdxjzt!=null and hdxjzt!=''">
-        and hdxjzt=#{hdxjzt}
+        and t.hdxjzt=#{hdxjzt}
       </if>
       <if test="hdxjztGzms!=null and hdxjztGzms!=''">
-        and hdxjzt_gzms=#{hdxjztGzms}
+        and t.hdxjzt_gzms=#{hdxjztGzms}
       </if>
       <if test="zxwxjq!=null and zxwxjq!=''">
-        and zxwxjq=#{zxwxjq}
+        and t.zxwxjq=#{zxwxjq}
       </if>
       <if test="cxwxjq!=null and cxwxjq!=''">
-        and cxwxjq=#{cxwxjq}
+        and t.cxwxjq=#{cxwxjq}
       </if>
       <if test="dljzt!=null and dljzt!=''">
-        and dljzt=#{dljzt}
+        and t.dljzt=#{dljzt}
       </if>
       <if test="dljztGzms!=null and dljztGzms!=''">
-        and dljzt_gzms=#{dljztGzms}
+        and t.dljzt_gzms=#{dljztGzms}
       </if>
       <if test="azzxlcz!=null and azzxlcz!=''">
-        and azzxlcz=#{azzxlcz}
+        and t.azzxlcz=#{azzxlcz}
       </if>
       <if test="azzxdg!=null and azzxdg!=''">
-        and azzxdg=#{azzxdg}
+        and t.azzxdg=#{azzxdg}
       </if>
       <if test="azcxlcz!=null and azcxlcz!=''">
-        and azcxlcz=#{azcxlcz}
+        and t.azcxlcz=#{azcxlcz}
       </if>
       <if test="azcxdg!=null and azcxdg!=''">
-        and azcxdg=#{azcxdg}
+        and t.azcxdg=#{azcxdg}
       </if>
       <if test="bzzxlcz!=null and bzzxlcz!=''">
-        and bzzxlcz=#{bzzxlcz}
+        and t.bzzxlcz=#{bzzxlcz}
       </if>
       <if test="bzzxdg!=null and bzzxdg!=''">
-        and bzzxdg=#{bzzxdg}
+        and t.bzzxdg=#{bzzxdg}
       </if>
       <if test="bzcxlcz!=null and bzcxlcz!=''">
-        and bzcxlcz=#{bzcxlcz}
+        and t.bzcxlcz=#{bzcxlcz}
       </if>
       <if test="bzcxdg!=null and bzcxdg!=''">
-        and bzcxdg=#{bzcxdg}
+        and t.bzcxdg=#{bzcxdg}
       </if>
       <if test="czzxlcz!=null and czzxlcz!=''">
-        and czzxlcz=#{czzxlcz}
+        and t.czzxlcz=#{czzxlcz}
       </if>
       <if test="czzxdg!=null and czzxdg!=''">
-        and czzxdg=#{czzxdg}
+        and t.czzxdg=#{czzxdg}
       </if>
       <if test="czcxlcz!=null and czcxlcz!=''">
-        and czcxlcz=#{czcxlcz}
+        and t.czcxlcz=#{czcxlcz}
       </if>
       <if test="czcxdg!=null and czcxdg!=''">
-        and czcxdg=#{czcxdg}
+        and t.czcxdg=#{czcxdg}
       </if>
       <if test="sbzt!=null and sbzt!=''">
-        and sbzt=#{sbzt}
+        and t.sbzt=#{sbzt}
       </if>
       <if test="checkUser!=null and checkUser!=''">
-        and check_user=#{checkUser}
+        and t.check_user=#{checkUser}
       </if>
       <if test="czwt!=null and czwt!=''">
-        and czwt=#{czwt}
+        and t.czwt=#{czwt}
       </if>
       <if test="submitState!=null and submitState!=''">
-        and submit_state=#{submitState}
+        and t.submit_state=#{submitState}
       </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>
       <if test="userId!=null and userId!=''">
-        and user_id=#{userId}
+        and t.user_id=#{userId}
       </if>
       <if test="delFlag!=null and delFlag!=''">
-        and del_flag=#{delFlag}
+        and t.del_flag=#{delFlag}
       </if>
     </where>
   </select>

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

@@ -37,7 +37,6 @@
     v.line_name,
     v.station_name as station_name,
     t.station_id,
-    t.xingbie,
     t.pillar_code,
     t.mdh,
     t.operation_date,
@@ -222,9 +221,6 @@
       <if test="stationId!=null and stationId!=''">
         and t.station_id=#{stationId}
       </if>
-      <if test="xingbie!=null and xingbie!=''">
-        and t.xingbie=#{xingbie}
-      </if>
       <if test="pillarCode!=null and pillarCode!=''">
         and t.pillar_code=#{pillarCode}
       </if>

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

@@ -202,8 +202,8 @@
       <if test="lineId!=null and lineId!=''">
         and v.line_id=#{lineId}
       </if>
-      <if test="hb!=null and hb!=''">
-        and t.hb=#{hb}
+      <if test="xingbie!=null and xingbie!=''">
+        and t.xingbie=#{xingbie}
       </if>
       <if test="stationId!=null and stationId!=''">
         and t.station_id=#{stationId}