From d1d1d978c2bfece5438ee846023d1c3146745f52 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 16 Apr 2024 16:02:35 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/domain/EmisTransLine.java     |  3 +++
 .../src/main/resources/mapper/EmisTransLineMapper.xml | 11 +++++++++++
 2 files changed, 14 insertions(+)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java
index 5a43d2e0b..07d75b20a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java
@@ -62,4 +62,7 @@ public class EmisTransLine extends BaseEntity
     private String logoType;
     /* 运输方式 */
     private String transType;
+
+    private String fromCountryName;
+    private String countryName;
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml
index cc573931a..f65553ffa 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml
@@ -27,12 +27,23 @@
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+
+        <association property="fromCountryName"    column="from_country" select="selectCountryNameByCode"/>
+        <association property="countryName"    column="country" select="selectCountryNameByCode"/>
+
     </resultMap>
 
     <sql id="selectEmisTransLineVo">
         select id, line_code, line_name, status, site_audit_man, site_audit_man_code, market_man, market_man_code, operate_man, operate_man_code, from_country, country, apply_scope, logo_type, trans_type, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_trans_line
     </sql>
 
+
+    <select id="selectCountryNameByCode" parameterType="String" resultType="string">
+        select a.name
+        from emis_country a
+        where a.code = #{code}
+    </select>
+
     <select id="selectEmisTransLineList" parameterType="EmisTransLine" resultMap="EmisTransLineResult">
         <include refid="selectEmisTransLineVo"/>
         <where>