From cb688381c6a5aaf73f8a5beccd594b1bbb71650e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 16 Apr 2024 21:26:15 +0800
Subject: [PATCH] md

---
 .../xdadan/erp/emis/domain/EmisTransLine.java  |  4 ++++
 .../resources/mapper/EmisTransLineMapper.xml   | 18 +++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)

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 07d75b20a..112d37c36 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
@@ -38,6 +38,10 @@ public class EmisTransLine extends BaseEntity
     private String lineCode;
     /* 线路名称 */
     private String lineName;
+    /* 英文名称 */
+    private String lineNameEn;
+    /* 计泡方式 */
+    private String meterRate;
     /* 启用状态 */
     private Integer status;
     /* 单证员 */
diff --git a/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml b/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml
index f65553ffa..ba6de52da 100644
--- a/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTransLineMapper.xml
@@ -8,6 +8,8 @@
         <result property="id"    column="id"    />
         <result property="lineCode"    column="line_code"    />
         <result property="lineName"    column="line_name"    />
+        <result property="lineNameEn"    column="line_name_en"    />
+        <result property="meterRate"    column="meter_rate"    />
         <result property="status"    column="status"    />
         <result property="siteAuditMan"    column="site_audit_man"    />
         <result property="siteAuditManCode"    column="site_audit_man_code"    />
@@ -34,14 +36,12 @@
     </resultMap>
 
     <sql id="selectEmisTransLineVo">
-        select id, line_code, line_name, 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, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_trans_line
+        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, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time from emis_trans_line
     </sql>
 
 
     <select id="selectCountryNameByCode" parameterType="String" resultType="string">
-        select a.name
-        from emis_country a
-        where a.code = #{code}
+        select a.name from emis_country a where a.code = #{code}
     </select>
 
     <select id="selectEmisTransLineList" parameterType="EmisTransLine" resultMap="EmisTransLineResult">
@@ -50,6 +50,8 @@
             <if test="id != null "> and id = #{id}</if>
             <if test="lineCode != null  and lineCode != ''"> and line_code like concat('%', #{lineCode}, '%')</if>
             <if test="lineName != null  and lineName != ''"> and line_name like concat('%', #{lineName}, '%')</if>
+            <if test="lineNameEn != null  and lineNameEn != ''"> and line_name_en like concat('%', #{lineNameEn}, '%')</if>
+            <if test="meterRate != null  and meterRate != ''"> and meter_rate like concat('%', #{meterRate}, '%')</if>
             <if test="status != null "> and status = #{status}</if>
             <if test="siteAuditMan != null  and siteAuditMan != ''"> and site_audit_man like concat('%', #{siteAuditMan}, '%')</if>
             <if test="siteAuditManCode != null  and siteAuditManCode != ''"> and site_audit_man_code like concat('%', #{siteAuditManCode}, '%')</if>
@@ -74,7 +76,7 @@
     </select>
 
     <select id="selectEmisTransLineById" parameterType="Long" resultMap="EmisTransLineResult">
-        select id, line_code, line_name, 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, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time
+        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, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time
         from emis_trans_line a
         where a.id = #{id}
     </select>
@@ -85,6 +87,8 @@
             <if test="id != null">id,</if>
             <if test="lineCode != null and lineCode != ''">line_code,</if>
             <if test="lineName != null and lineName != ''">line_name,</if>
+            <if test="lineNameEn != null and lineNameEn != ''">line_name_en,</if>
+            <if test="meterRate != null and meterRate != ''">meter_rate,</if>
             <if test="status != null">status,</if>
             <if test="siteAuditMan != null and siteAuditMan != ''">site_audit_man,</if>
             <if test="siteAuditManCode != null and siteAuditManCode != ''">site_audit_man_code,</if>
@@ -109,6 +113,8 @@
             <if test="id != null">#{id},</if>
             <if test="lineCode != null and lineCode != ''">#{lineCode},</if>
             <if test="lineName != null and lineName != ''">#{lineName},</if>
+            <if test="lineNameEn != null and lineNameEn != ''">#{lineNameEn},</if>
+            <if test="meterRate != null and meterRate != ''">#{meterRate},</if>
             <if test="status != null">#{status},</if>
             <if test="siteAuditMan != null and siteAuditMan != ''">#{siteAuditMan},</if>
             <if test="siteAuditManCode != null and siteAuditManCode != ''">#{siteAuditManCode},</if>
@@ -136,6 +142,8 @@
         <trim prefix="SET" suffixOverrides=",">
             <if test="lineCode != null and lineCode != ''">line_code = #{lineCode},</if>
             <if test="lineName != null and lineName != ''">line_name = #{lineName},</if>
+            <if test="lineNameEn != null and lineNameEn != ''">line_name_en = #{lineNameEn},</if>
+            <if test="meterRate != null and meterRate != ''">meter_rate = #{meterRate},</if>
             <if test="status != null">status = #{status},</if>
             <if test="siteAuditMan != null and siteAuditMan != ''">site_audit_man = #{siteAuditMan},</if>
             <if test="siteAuditManCode != null and siteAuditManCode != ''">site_audit_man_code = #{siteAuditManCode},</if>