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

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

@@ -31,30 +31,30 @@
   </resultMap>
 
   <sql id="Base_Column_List">
-    line_id,
-    dept_parent_name,
-    dept_id,
-    dept_name,
-    line_name,
-    xingbie,
-    line_sddj,
-    line_type,
-    line_dj,
-    line_ktrq,
-    line_yylc,
-    line_start_marker,
-    line_end_marker,
-    line_gdfs,
-    line_xglx,
-    line_qt,
-    line_sjbh,
-    order_num,
-    status,
-    del_flag,
-    create_by,
-    create_time,
-    update_by,
-    update_time
+    t.line_id,
+    d1.dept_name as dept_parent_name,
+    t.dept_id,
+    d.dept_name,
+    t.line_name,
+    t.xingbie,
+    t.line_sddj,
+    t.line_type,
+    t.line_dj,
+    t.line_ktrq,
+    t.line_yylc,
+    t.line_start_marker,
+    t.line_end_marker,
+    t.line_gdfs,
+    t.line_xglx,
+    t.line_qt,
+    t.line_sjbh,
+    t.order_num,
+    t.status,
+    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.BusLine">
@@ -239,82 +239,83 @@
   <select id="getInfo" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List"/>
-    FROM base_line
-    WHERE del_flag='0' and line_id = #{lineId}
+    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
+    WHERE t.del_flag='0' and t.line_id = #{lineId}
 
   </select>
 
   <select id="getList" resultMap="BaseResultMap">
     SELECT
     <include refid="Base_Column_List"/>
-    FROM base_line
+    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
     <where>
-      del_flag='0'
+      t.del_flag='0'
       <if test="deptId!=null and deptId!=''">
-        and dept_id=#{deptId}
-      </if>
-      <if test="deptName!=null and deptName!=''">
-        and dept_name=#{deptName}
+        and t.dept_id=#{deptId}
       </if>
       <if test="lineName!=null and lineName!=''">
-        and line_name=#{lineName}
+        and t.line_name like concat('%', #{lineName}, '%')
       </if>
       <if test="xingbie!=null and xingbie!=''">
-        and xingbie=#{xingbie}
+        and t.xingbie=#{xingbie}
       </if>
       <if test="lineSddj!=null and lineSddj!=''">
-        and line_sddj=#{lineSddj}
+        and t.line_sddj=#{lineSddj}
       </if>
       <if test="lineType!=null and lineType!=''">
-        and line_type=#{lineType}
+        and t.line_type=#{lineType}
       </if>
       <if test="lineDj!=null and lineDj!=''">
-        and line_dj=#{lineDj}
+        and t.line_dj=#{lineDj}
       </if>
       <if test="lineKtrq!=null and lineKtrq!=''">
-        and line_ktrq=#{lineKtrq}
+        and t.line_ktrq=#{lineKtrq}
       </if>
       <if test="lineYylc!=null and lineYylc!=''">
-        and line_yylc=#{lineYylc}
+        and t.line_yylc=#{lineYylc}
       </if>
       <if test="lineStartMarker!=null and lineStartMarker!=''">
-        and line_start_marker=#{lineStartMarker}
+        and t.line_start_marker=#{lineStartMarker}
       </if>
       <if test="lineEndMarker!=null and lineEndMarker!=''">
-        and line_end_marker=#{lineEndMarker}
+        and t.line_end_marker=#{lineEndMarker}
       </if>
       <if test="lineGdfs!=null and lineGdfs!=''">
-        and line_gdfs=#{lineGdfs}
+        and t.line_gdfs=#{lineGdfs}
       </if>
       <if test="lineXglx!=null and lineXglx!=''">
-        and line_xglx=#{lineXglx}
+        and t.line_xglx=#{lineXglx}
       </if>
       <if test="lineQt!=null and lineQt!=''">
-        and line_qt=#{lineQt}
+        and t.line_qt=#{lineQt}
       </if>
       <if test="lineSjbh!=null and lineSjbh!=''">
-        and line_sjbh=#{lineSjbh}
+        and t.line_sjbh=#{lineSjbh}
       </if>
       <if test="orderNum!=null and orderNum!=''">
-        and order_num=#{orderNum}
+        and t.order_num=#{orderNum}
       </if>
       <if test="status!=null and status!=''">
-        and status=#{status}
+        and t.status=#{status}
       </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>