From 2cdd3defa25d6584b7c986504267f0bdb812f120 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sat, 11 May 2024 19:07:36 +0800
Subject: [PATCH] md

---
 .../main/java/com/xdadan/erp/emis/domain/EmisTransLine.java | 3 +++
 emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml  | 6 ++++++
 2 files changed, 9 insertions(+)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java
index 5186e4454..07b203272 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTransLine.java
@@ -68,6 +68,9 @@ public class EmisTransLine extends BaseEntity
     /* 显示顺序 */
     private Integer orderNum;
 
+    // ---- 非数据库字段
     private String fromCountryName;
     private String countryName;
+
+    private String brandName;
 }
diff --git a/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml
index ec1177c19..abdd6d10c 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml
@@ -35,6 +35,8 @@
 
         <association property="fromCountryName"    column="from_country" select="selectCountryNameByCode"/>
         <association property="countryName"    column="country" select="selectCountryNameByCode"/>
+        <association property="brandName"    column="logo_type" select="selectBrandNameByCode"/>
+
 
     </resultMap>
 
@@ -43,6 +45,10 @@
         select a.name from emis_country a where a.code = #{code}
     </select>
 
+    <select id="selectBrandNameByCode" parameterType="String" resultType="string">
+        select concat(a.name,'(',a.name_en,')') as name from emis_brand a where a.code = #{code}
+    </select>
+
     <sql id="selectEmisTransLineVo">
         select id, line_code, line_name, line_name_en, meter_rate, status, site_audit_man, site_audit_man_code, market_man, market_man_code, operate_man, operate_man_code, from_country, country, apply_scope, logo_type, trans_type, order_num, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_trans_line
     </sql>