From 0f2807eb87f8270789f388e52ecb0ce57928b0fe Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 30 May 2024 00:56:13 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisTmsTransPlan.java     |  2 ++
 .../mapper/EmisTmsTransPlanMapper.xml         | 25 +++++++++++++++++++
 2 files changed, 27 insertions(+)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlan.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlan.java
index 905736016..d658b3a04 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlan.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsTransPlan.java
@@ -53,6 +53,8 @@ public class EmisTmsTransPlan extends BaseEntity
     private String transLineTypeName;
     private String productTypeName;
 
+    private EmisTransLine transLine;
+
     private List<EmisTmsTransPlanDtl> stepList;
 
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
index c0b29b041..a6f4fc0fc 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
@@ -23,8 +23,26 @@
         <association property="productTypeName"    column="prod_code" select="selectProdNameByCode"/>
         <association property="transLineTypeName"    column="trans_line_code" select="selectLineNameByCode"/>
 
+        <association property="transLine"    column="trans_line_code" select="selectTransLineNameByCode"/>
+
     </resultMap>
 
+    <resultMap type="EmisTransLine" id="EmisTransLineResult">
+        <result property="lineCode"    column="line_code"    />
+        <result property="lineName"    column="line_name"    />
+        <result property="lineNameEn"    column="line_name_en"    />
+        <result property="fromCountry"    column="from_country"    />
+        <result property="country"    column="country"    />
+
+        <association property="fromCountryName"    column="from_country" select="selectCountryNameByCode"/>
+        <association property="countryName"    column="country" select="selectCountryNameByCode"/>
+
+    </resultMap>
+
+    <select id="selectCountryNameByCode" parameterType="String" resultType="string">
+        select a.name from emis_country a where a.code = #{code}
+    </select>
+
     <select id="selectProdNameByCode" parameterType="String" resultType="string">
         select group_concat(a.prod_name) from emis_trans_product a where FIND_IN_SET(a.prod_code, #{code}) limit 1
     </select>
@@ -33,6 +51,13 @@
         select a.line_name from emis_trans_line a where a.line_code = #{code} limit 1
     </select>
 
+    <select id="selectTransLineNameByCode" parameterType="String" resultType="EmisTransLineResult">
+        select * from emis_trans_line a where a.line_code = #{code} limit 1
+    </select>
+
+
+
+
     <sql id="selectEmisTmsTransPlanVo">
         select id, plan_code, plan_name, trans_line_type, product_type, status, del_flag, create_by, create_time, update_by, update_time, remark, create_site, update_site from emis_tms_trans_plan
     </sql>