From 69d48e6acd3ca3c1a6610fee972d30775c89f80f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 8 Jun 2024 15:07:48 +0800
Subject: [PATCH] md

---
 .../src/main/resources/mapper/EmisBaseMapper.xml    | 10 ++++++++++
 .../resources/mapper/EmisTmsTransPlanMapper.xml     | 13 +++----------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
index a0c42a869..d0f1118c4 100644
--- a/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisBaseMapper.xml
@@ -74,6 +74,16 @@
         select trans_line_code from emis_trans_product a where del_flag='0' and prod_code=#{code} limit 1
     </select>
 
+    <!--    根据线路获取出发国家名称-->
+    <select id="selectFromCountryNameByLineCode" parameterType="String" resultType="string">
+        select a.name from emis_country a,emis_trans_line b where a.del_flag='0' and b.del_flag='0' and a.code=b.from_country and b.line_code = #{code}  limit 1
+    </select>
+
+    <!--  根据线路获取目的国家名称 -->
+    <select id="selectDestCountryNameByLineCode" parameterType="String" resultType="string">
+        select a.name from emis_country a,emis_trans_line b where  a.del_flag='0' and b.del_flag='0' and a.code=b.country and b.line_code = #{code}  limit 1
+    </select>
+
     <!--目的地名称-->
     <select id="selectDestNameByCode" parameterType="String" resultType="string">
         select a.dest_name from emis_destination a where a.dest_code = #{code} and a.del_flag='0' limit 1
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
index 1a52985c6..3aa04b0fc 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsTransPlanMapper.xml
@@ -17,20 +17,13 @@
         <association property="transLineTypeName"    column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectLineNameByCode"/>
 
         <!--   个性化查询     -->
-        <association property="totalEstCostDay"    column="id" select="selectTotalEstCostDayByPlanId"/>
-        <association property="fromCountryName"    column="trans_line_type" select="selectFromCountryNameByLineCode"/>
-        <association property="countryName"    column="trans_line_type" select="selectCountryNameByLineCode"/>
+        <association property="fromCountryName"    column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectFromCountryNameByLineCode"/>
+        <association property="countryName"    column="trans_line_type" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectDestCountryNameByLineCode"/>
 
+        <association property="totalEstCostDay"    column="id" select="selectTotalEstCostDayByPlanId"/>
 
     </resultMap>
 
-    <select id="selectFromCountryNameByLineCode" parameterType="String" resultType="string">
-        select a.name from emis_country a,emis_trans_line b where a.del_flag='0' and b.del_flag='0' and a.code=b.from_country and b.line_code = #{code}  limit 1
-    </select>
-
-    <select id="selectCountryNameByLineCode" parameterType="String" resultType="string">
-        select a.name from emis_country a,emis_trans_line b where  a.del_flag='0' and b.del_flag='0' and a.code=b.country and b.line_code = #{code}  limit 1
-    </select>
 
     <select id="selectTotalEstCostDayByPlanId" parameterType="long" resultType="BigDecimal">
         select sum(a.est_cost_day) as est_cost_day from emis_tms_trans_plan_dtl a where  a.del_flag='0' and a.plan_id = #{id}  limit 1