From a78e175db3f9c5e87619b2cac8bea925a54ab182 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 28 Oct 2024 11:45:54 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/domain/EmisCommissionQuote.java     | 5 +++++
 .../src/main/resources/mapper/EmisCommissionQuoteMapper.xml | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java
index f29c84247..ecdf4cf3c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisCommissionQuote.java
@@ -66,4 +66,9 @@ public class EmisCommissionQuote extends BaseEntity
     /* 优先级 */
     private Integer priorityLevel;
 
+    // ---- 非数据库字段
+    private String fromCountryName;
+    private String countryName;
+
+
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
index 1987252d8..10698e08a 100644
--- a/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisCommissionQuoteMapper.xml
@@ -4,7 +4,7 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xdadan.erp.emis.mapper.EmisCommissionQuoteMapper">
 
-    <resultMap type="EmisCommissionQuote" id="EmisCommissionQuoteResult">
+    <resultMap type="EmisCommissionQuote" id="EmisCommissionQuoteResult" extends="com.xdadan.erp.emis.mapper.EmisBaseMapper.EmisBaseResult">
         <result property="quoteId"    column="quote_id"    />
         <result property="quoteCode"    column="quote_code"    />
         <result property="quoteName"    column="quote_name"    />
@@ -20,6 +20,10 @@
         <result property="startDate"    column="start_date"    />
         <result property="endDate"    column="end_date"    />
         <result property="priorityLevel"    column="priority_level"    />
+
+        <association property="fromCountryName"    column="from_country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
+        <association property="countryName"    column="country" select="com.xdadan.erp.emis.mapper.EmisBaseMapper.selectCountryNameByCode"/>
+
     </resultMap>
 
     <sql id="selectEmisCommissionQuoteVo">