From e5ee68bfca282dda2cafb15d268621a2100f639f Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 18 Apr 2024 19:52:50 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/domain/EmisSite.java   |  7 +++++++
 .../main/resources/mapper/EmisSiteMapper.xml   | 18 ++++++++++++++++--
 2 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java
index 91a2ebf88..e8948025a 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisSite.java
@@ -269,6 +269,13 @@ public class EmisSite extends BaseEntity
     private String updateSite;
 
 
+
+    private String countryName;
+    private String provinceName;
+    private String cityName;
+    private String countyName;
+    private String townName;
+
     private String parentSiteName;
     private String superiorFinanceCenterName;
 
diff --git a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
index b5a9e6f51..66613a639 100644
--- a/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSiteMapper.xml
@@ -100,7 +100,6 @@
         <result property="sitePos"    column="site_pos"    />
         <result property="distributeCode"    column="distribute_code"    />
         <result property="blPushSite"    column="bl_push_site"    />
-
         <result property="sizeCode2"    column="size_code2"    />
         <result property="sizeCode3"    column="size_code3"    />
         <result property="auditStatus"    column="audit_status"    />
@@ -129,6 +128,12 @@
         <result property="createSite"    column="create_site"    />
         <result property="updateSite"    column="update_site"    />
 
+        <association property="countryName"    column="countryCode" select="selectCountryNameByCode"/>
+        <association property="provinceName"    column="province" select="selectRegionNameByCode"/>
+        <association property="cityName"    column="city" select="selectRegionNameByCode"/>
+        <association property="countyName"    column="county" select="selectRegionNameByCode"/>
+        <association property="townName"    column="town" select="selectRegionNameByCode"/>
+
         <association property="parentSiteName"    column="parent_site_code" select="selectSiteNameByCode"/>
         <association property="superiorFinanceCenterName"    column="superior_finance_center_code" select="selectSiteNameByCode"/>
         <association property="logoType"    column="logo_type" select="selectBrandNameByCode"/>
@@ -139,6 +144,15 @@
         select id, site_code, site_name, site_name_en, parent_site_code, default_currency, cut_off_time, superior_finance_center_code, site_type, scope_type, default_destination_name_code, default_send_place, country_code, province, city, county, town, area_code, area_name, range_name, phone, principal, manager, manager_phone, sale_phone, exigence_phone, fax, site_desc, dispatch_range, not_dispatch_range, public_remark, private_remark, order_num, financial_account, tb_ser_name, tb_ser_tel, tb_ser_ww, car_start_time, car_end_time, bl_web, join_time, maps_coordinate, specservice_range, qq, email, service_quality, sales_quality, levels, warehouse_name, site_limite, jy_mobile, jy_pwd, bl_not_input, stop_date, bl_allow_agent_money, bl_allow_topayment, goods_payment_limited, topayment_limited, bl_rec, bl_disp, bl_come, bl_open_taobao, bl_arbitration_department, bl_allow_agent_sign, bl_message, bl_provide, bl_projectclient, bl_vip_site, bl_dispatch_zt, bl_billto_account, account_code, address, disp_delivery_mode, trans_type_id, trans_type_name, org_id, org_name, data_from, site_area, bl_allow_disp_agent_money, disp_goods_payment_limited, disp_delivery_site, disp_delivery_site_code, vendor_name, credit_code, bl_cargo_service, bl_handling_service, pickup_center_site_code, bl_disp_good, bl_push_jd, push_date, reason, site_pos, distribute_code, bl_push_site, logo_type, size_code2, size_code3, audit_status, audit_date, audit_man_code, audit_site_code, bl_class, bl_material, soon_piece_type, province_area, second_area, second_area_code, province_area_code, bl_disp_good_name, bl_not_rec, bl_not_disp, bl_not_cash_out, status, remark, tenant_id, del_flag, create_by, create_time, update_by, update_time, create_site, update_site from emis_site
     </sql>
 
+    <select id="selectCountryNameByCode" parameterType="String" resultType="string">
+        select a.name from emis_country a where a.code = #{code} limit 1
+    </select>
+
+
+    <select id="selectRegionNameByCode" parameterType="String" resultType="string">
+        select a.region_name from emis_region a where a.region_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>
@@ -274,7 +288,7 @@
             <if test="createSite != null  and createSite != ''"> and create_site like concat('%', #{createSite}, '%')</if>
             <if test="updateSite != null  and updateSite != ''"> and update_site like concat('%', #{updateSite}, '%')</if>
         </where>
-        order by create_time desc
+        order by site_code desc
     </select>
 
     <select id="selectEmisSiteById" parameterType="Long" resultMap="EmisSiteResult">