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

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

@@ -187,7 +187,7 @@
         and a.station_id=#{stationId}
       </if>
       <if test="xingbie!=null and xingbie!=''">
-        and a.xingbie=#{deptId}
+        and a.xingbie=#{xingbie}
       </if>
       <if test="fjlx!=null and fjlx!=''">
         and a.fjlx=#{fjlx}

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

@@ -16,7 +16,7 @@
     <result column="ghh_sccj" property="ghhSccj"/>
     <result column="ghyy" property="ghyy"/>
     <result column="ghsj" property="ghsj"/>
-    <result column="czr" property="czr"/>
+    <result column="operator" property="operator"/>
     <result column="remark" property="remark"/>
     <result column="submit_state" property="submitState"/>
     <result column="del_flag" property="delFlag"/>
@@ -39,7 +39,7 @@
     ghh_sccj,
     ghyy,
     ghsj,
-    czr,
+    operator,
     remark,
     submit_state,
     del_flag,
@@ -58,9 +58,6 @@
       <if test='null != stationId'>
         station_id,
       </if>
-      <if test='null != stationName'>
-        station_name,
-      </if>
       <if test='null != dd'>
         dd,
       </if>
@@ -88,8 +85,8 @@
       <if test='null != ghsj'>
         ghsj,
       </if>
-      <if test='null != czr'>
-        czr,
+      <if test='null != operator'>
+        operator,
       </if>
       <if test='null != remark'>
         remark,
@@ -117,9 +114,6 @@
       <if test='null != stationId'>
         #{stationId},
       </if>
-      <if test='null != stationName'>
-        #{stationName},
-      </if>
       <if test='null != dd'>
         #{dd},
       </if>
@@ -147,8 +141,8 @@
       <if test='null != ghsj'>
         #{ghsj},
       </if>
-      <if test='null != czr'>
-        #{czr},
+      <if test='null != operator'>
+        #{operator},
       </if>
       <if test='null != remark'>
         #{remark},
@@ -184,7 +178,6 @@
     UPDATE bus_jceb_lbjghjl
     <set>
       <if test='null != stationId'>station_id = #{stationId},</if>
-      <if test='null != stationName'>station_name = #{stationName},</if>
       <if test='null != dd'>dd = #{dd},</if>
       <if test='null != ghqMc'>ghq_mc = #{ghqMc},</if>
       <if test='null != ghqGgxh'>ghq_ggxh = #{ghqGgxh},</if>
@@ -194,7 +187,7 @@
       <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 != czr'>czr = #{czr},</if>
+      <if test='null != operator'>operator = #{operator},</if>
       <if test='null != remark'>remark = #{remark},</if>
       <if test='null != submitState'>submit_state = #{submitState},</if>
       <if test='null != delFlag'>del_flag = #{delFlag},</if>
@@ -210,10 +203,10 @@
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
     DISTINCT
-    s.station_name,
+    v.station_name,
     a.*
     FROM bus_jceb_lbjghjl a
-    LEFT JOIN base_station s ON a.station_id = s.station_id
+    LEFT JOIN v_station v ON a.station_id = v.station_id
     WHERE
     a.del_flag = '0'
     AND s.del_flag = '0'
@@ -222,19 +215,15 @@
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
-    s.station_name,
+    v.station_name,
     a.*
     FROM bus_jceb_lbjghjl a
-    LEFT JOIN base_station s ON a.station_id = s.station_id
+    LEFT JOIN v_station v ON a.station_id = v.station_id
     <where>
       a.del_flag = '0'
-      AND s.del_flag = '0'
       <if test="stationId!=null and stationId!=''">
         and a.station_id=#{stationId}
       </if>
-      <if test="stationName!=null and stationName!=''">
-        and a.station_name=#{stationName}
-      </if>
       <if test="dd!=null and dd!=''">
         and a.dd=#{dd}
       </if>
@@ -262,8 +251,8 @@
       <if test="ghsj!=null and ghsj!=''">
         and a.ghsj=#{ghsj}
       </if>
-      <if test="czr!=null and czr!=''">
-        and a.czr=#{czr}
+      <if test="operator!=null and operator!=''">
+        and a.operator=#{operator}
       </if>
       <if test="remark!=null and remark!=''">
         and a.remark=#{remark}