From 306f9f0125b7fa3b181e807a59fd214e9441bdb1 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 22 Apr 2024 21:06:08 +0800
Subject: [PATCH] md

---
 .../erp/emis/domain/EmisQuotePrice.java       | 13 +++++++----
 .../resources/mapper/EmisQuotePriceMapper.xml | 22 +++++++++++++++++--
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java
index c94bc53ea..490f85dbb 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisQuotePrice.java
@@ -48,14 +48,12 @@ public class EmisQuotePrice extends BaseEntity
     private String useSite;
     /* 所属线路代码 */
     private String transLineCode;
-    /* 所属线路名称 */
-    private String transLine;
+
     /* 费用类型 运输费 */
     private String feeType;
     /* 产品类型代码 */
     private String prodCode;
-    /* 产品类型名称 */
-    private String prodName;
+
     /* 录入收费项 */
     private String recPayType;
     /* 计费类型 1-重量计费 2-体积计费 */
@@ -109,6 +107,13 @@ public class EmisQuotePrice extends BaseEntity
     /* 更新网点 */
     private String updateSite;
 
+    // 扩展VO
+    private String useSiteName;
+    /* 所属线路名称 */
+    private String transLine;
+    /* 产品类型名称 */
+    private String prodName;
+
     private List<EmisQuoteExpression> quoteExpressions;
 
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
index 36dcb861e..063a74e91 100644
--- a/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisQuotePriceMapper.xml
@@ -11,10 +11,8 @@
         <result property="useSiteCode"    column="use_site_code"    />
         <result property="useSite"    column="use_site"    />
         <result property="transLineCode"    column="trans_line_code"    />
-        <result property="transLine"    column="trans_line"    />
         <result property="feeType"    column="fee_type"    />
         <result property="prodCode"    column="prod_code"    />
-        <result property="prodName"    column="prod_name"    />
         <result property="recPayType"    column="rec_pay_type"    />
         <result property="billType"    column="bill_type"    />
         <result property="otherType1"    column="other_type1"    />
@@ -47,12 +45,32 @@
         <result property="updateTime"    column="update_time"    />
         <result property="createSite"    column="create_site"    />
         <result property="updateSite"    column="update_site"    />
+
+        <result property="prodName"    column="prod_name"    />
+
+        <association property="prodName"    column="prod_code" select="selectProdNameByCode"/>
+        <association property="transLine"    column="trans_line" select="selectLineNameByCode"/>
+        <association property="useSiteName"    column="use_site_code" select="selectSiteNameByCode"/>
+
     </resultMap>
 
+
     <sql id="selectEmisQuotePriceVo">
         select quote_id, quote_name, quote_code, use_site_code, use_site, trans_line_code, trans_line, fee_type, prod_code, prod_name, rec_pay_type, bill_type, other_type1, other_type2, carry_type, status, disp_area_id, disp_area_name, disp_area_site, disp_area_site_code, disp_area_site_id, send_area_id, send_area_name, send_area_site, send_area_site_code, send_area_site_id, carries_number, discards_number, least_price, price_type, start_date, end_date, priority_level, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_quote_price
     </sql>
 
+    <select id="selectProdNameByCode" parameterType="String" resultType="string">
+        select a.prod_name from emis_trans_product a where a.prod_code = #{code} limit 1
+    </select>
+
+    <select id="selectLineNameByCode" parameterType="String" resultType="string">
+        select a.line_name from emis_trans_line a where a.line_code = #{code} limit 1
+    </select>
+
+    <select id="selectSiteNameByCode" parameterType="String" resultType="string">
+        select a.site_name from emis_site a where a.site_code = #{code} limit 1
+    </select>
+
     <select id="selectEmisQuotePriceList" parameterType="EmisQuotePrice" resultMap="EmisQuotePriceResult">
         <include refid="selectEmisQuotePriceVo"/>
         <where>