From 1138a3e91d5af39293fb725e5dbfdcd62a6f5863 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 30 May 2024 05:52:59 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisTmsTransPlan.java     |  5 ++--
 .../mapper/EmisTmsTransPlanMapper.xml         | 26 ++++++++-----------
 2 files changed, 14 insertions(+), 17 deletions(-)

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 8c7f16214..06dc20f20 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,11 +53,12 @@ public class EmisTmsTransPlan extends BaseEntity
     private String transLineTypeName;
     private String productTypeName;
 
+    private String fromCountryName;
+    private String countryName;
+
     // 累计时效
     private BigDecimal totalEstCostDay;
 
-    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 736d4e790..493881663 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
@@ -27,22 +27,18 @@
 
         <association property="totalEstCostDay"    column="id" select="selectTotalEstCostDayByPlanId"/>
 
-    </resultMap>
+        <association property="fromCountryName"    column="trans_line_code" select="selectFromCountryNameByLineCode"/>
+        <association property="countryName"    column="trans_line_code" select="selectCountryNameByLineCode"/>
 
-    <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 id="selectFromCountryNameByLineCode" parameterType="String" resultType="string">
+        select a.name from emis_country a,emis_trans_line b where a.code=b.from_country and b.code = #{code}
+    </select>
+
+    <select id="selectCountryNameByLineCode" parameterType="String" resultType="string">
+        select a.name from emis_country a,emis_trans_line b where a.code=b.country and b.code = #{code}
     </select>
 
     <select id="selectTotalEstCostDayByPlanId" parameterType="long" resultType="BigDecimal">
@@ -57,9 +53,9 @@
         select a.line_name from emis_trans_line a where a.line_code = #{code} limit 1
     </select>
 
-    <select id="selectTransLineResultByCode" parameterType="String" resultMap="EmisTransLineResult">
-        select * from emis_trans_line a where a.line_code = #{code} limit 1
-    </select>
+<!--    <select id="selectTransLineResultByCode" parameterType="String" resultMap="EmisTransLineResult">-->
+<!--        select * from emis_trans_line a where a.line_code = #{code} limit 1-->
+<!--    </select>-->