【CHG】全面检测记录关联基础表查询返回相应中文。

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

@@ -25,6 +25,9 @@ public class BusJcebQmjcjl extends BaseEntity{
     @Length(min = 1, max = 100, message = "【站场(区间)】长度必须介于 {min} 和 {max} 之间")
     private String qj;
 
+    @ApiModelProperty(value = "站场(区间)名称")
+    private String stationName;
+
     @ApiModelProperty(value = "支柱号（或悬挂点）")
     @Length(min = 1, max = 20, message = "【支柱号（或悬挂点）】长度必须介于 {min} 和 {max} 之间")
     private String zzh;

railway-business/src/main/resources/mapper/business/BusJcebQmjcjlMapper.xml

@@ -27,6 +27,7 @@
                 <result column="create_time" property="createTime"/>
                 <result column="update_by" property="updateBy"/>
                 <result column="update_time" property="updateTime"/>
+                <result column="station_name" property="stationName"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -236,83 +237,90 @@
 
     <select id="getInfo" resultMap="BaseResultMap">
         SELECT
-        <include refid="Base_Column_List"/>
-        FROM bus_jceb_qmjcjl
-        WHERE del_flag='0' and id = #{id}
-
+            s.station_name,
+            a.*
+        FROM bus_jceb_qmjcjl a
+        LEFT JOIN bus_station s ON a.qj = s.station_id
+        WHERE
+            a.del_flag = '0'
+            AND s.del_flag = '0'
+            AND a.id = #{id}
     </select>
 
     <select id="getList" resultMap="BaseResultMap">
         SELECT
-        <include refid="Base_Column_List"/>
-        FROM bus_jceb_qmjcjl
+            s.station_name,
+            a.*
+        FROM bus_jceb_qmjcjl a
+        LEFT JOIN bus_station s ON a.qj = s.station_id
         <where>
-            del_flag='0'
+            a.del_flag = '0'
+            AND s.del_flag = '0'
                 <if test="qj!=null and qj!=''">
-                    and qj=#{qj}
+                    and a.qj=#{qj}
                 </if>
                 <if test="zzh!=null and zzh!=''">
-                    and zzh=#{zzh}
+                    and a.zzh=#{zzh}
                 </if>
                 <if test="qxly!=null and qxly!=''">
-                    and qxly=#{qxly}
+                    and a.qxly=#{qxly}
                 </if>
                 <if test="wz!=null and wz!=''">
-                    and wz=#{wz}
+                    and a.wz=#{wz}
                 </if>
                 <if test="qxnr!=null and qxnr!=''">
-                    and qxnr=#{qxnr}
+                    and a.qxnr=#{qxnr}
                 </if>
                 <if test="qxdj!=null and qxdj!=''">
-                    and qxdj=#{qxdj}
+                    and a.qxdj=#{qxdj}
                 </if>
                 <if test="clcs!=null and clcs!=''">
-                    and clcs=#{clcs}
+                    and a.clcs=#{clcs}
                 </if>
                 <if test="xhzt!=null and xhzt!=''">
-                    and xhzt=#{xhzt}
+                    and a.xhzt=#{xhzt}
                 </if>
                 <if test="whby!=null and whby!=''">
-                    and whby=#{whby}
+                    and a.whby=#{whby}
                 </if>
                 <if test="jyqs!=null and jyqs!=''">
-                    and jyqs=#{jyqs}
+                    and a.jyqs=#{jyqs}
                 </if>
                 <if test="sbzt!=null and sbzt!=''">
-                    and sbzt=#{sbzt}
+                    and a.sbzt=#{sbzt}
                 </if>
                 <if test="czr!=null and czr!=''">
-                    and czr=#{czr}
+                    and a.czr=#{czr}
                 </if>
                 <if test="gzldr!=null and gzldr!=''">
-                    and gzldr=#{gzldr}
+                    and a.gzldr=#{gzldr}
                 </if>
                 <if test="ysr!=null and ysr!=''">
-                    and ysr=#{ysr}
+                    and a.ysr=#{ysr}
                 </if>
                 <if test="rq!=null and rq!=''">
-                    and rq=#{rq}
+                    and a.rq=#{rq}
                 </if>
                 <if test="remark!=null and remark!=''">
-                    and remark=#{remark}
+                    and a.remark=#{remark}
                 </if>
                 <if test="submitState!=null and submitState!=''">
-                    and submit_state=#{submitState}
+                    and a.submit_state=#{submitState}
                 </if>
                 <if test="delFlag!=null and delFlag!=''">
-                    and del_flag=#{delFlag}
+                    and a.del_flag=#{delFlag}
                 </if>
                 <if test="createBy!=null and createBy!=''">
-                    and create_by=#{createBy}
+                    and a.create_by=#{createBy}
                 </if>
                 <if test="createTime!=null and createTime!=''">
-                    and create_time=#{createTime}
+                    and a.create_time=#{createTime}
                 </if>
                 <if test="updateBy!=null and updateBy!=''">
-                    and update_by=#{updateBy}
+                    and a.update_by=#{updateBy}
                 </if>
                 <if test="updateTime!=null and updateTime!=''">
-                    and update_time=#{updateTime}
+                    and a.update_time=#{updateTime}
                 </if>
         </where>
     </select>