From 87a1d5c16f98da188ebfc976d1996c94cda2a1c8 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 19 Apr 2024 23:21:01 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/domain/EmisDestination.java    |  3 ++-
 .../main/resources/mapper/EmisDestinationMapper.xml    | 10 +++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisDestination.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisDestination.java
index b96ddb9e7..4a07b6a0c 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisDestination.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisDestination.java
@@ -33,7 +33,6 @@ public class EmisDestination extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-
     /* 序号 */
     private Long id;
     /* 目的地编码 */
@@ -60,6 +59,8 @@ public class EmisDestination extends BaseEntity
     private String town;
     /* 是否偏远地区 0-否 1-是 */
     private Integer isHinterland;
+    /* 管辖片区id */
+    private Long countryAreaId;
     /* 创建网点 */
     private String createSite;
     /* 更新网点 */
diff --git a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
index 74439ef82..6be5393ca 100644
--- a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
@@ -18,6 +18,7 @@
         <result property="county"    column="county"    />
         <result property="town"    column="town"    />
         <result property="isHinterland"    column="is_hinterland"    />
+        <result property="countryAreaId"    column="country_area_id"    />
         <result property="remark"    column="remark"    />
         <result property="tenantId"    column="tenant_id"    />
         <result property="delFlag"    column="del_flag"    />
@@ -36,11 +37,10 @@
         <association property="townName"    column="town" select="selectRegionNameByCode"/>
         <association property="siteName"    column="site_code" select="selectSiteNameByCode"/>
 
-
     </resultMap>
 
     <sql id="selectEmisDestinationVo">
-        select id, dest_code, dest_name, dest_name_en, status, line_code, country, site_code, province, city, county, town, is_hinterland, remark, tenant_id, del_flag, create_by, create_site, create_time, update_by, update_site, update_time from emis_destination
+        select id, dest_code, dest_name, dest_name_en, status, line_code, country, site_code, province, city, county, town, is_hinterland, country_area_id, remark, tenant_id, del_flag, create_by, create_site, create_time, update_by, update_site, update_time from emis_destination
     </sql>
 
     <select id="selectCountryNameByCode" parameterType="String" resultType="string">
@@ -74,6 +74,7 @@
             <if test="city != null  and city != ''"> and city like concat('%', #{city}, '%')</if>
             <if test="county != null  and county != ''"> and county like concat('%', #{county}, '%')</if>
             <if test="town != null  and town != ''"> and town like concat('%', #{town}, '%')</if>
+            <if test="countryAreaId != null "> and country_area_id = #{countryAreaId}</if>
             <if test="isHinterland != null "> and is_hinterland = #{isHinterland}</if>
             <if test="remark != null  and remark != ''"> and remark like concat('%', #{remark}, '%')</if>
             <if test="tenantId != null  and tenantId != ''"> and tenant_id like concat('%', #{tenantId}, '%')</if>
@@ -89,7 +90,7 @@
     </select>
 
     <select id="selectEmisDestinationById" parameterType="Long" resultMap="EmisDestinationResult">
-        select id, dest_code, dest_name, dest_name_en, status, line_code, country, site_code, province, city, county, town, is_hinterland, remark, tenant_id, del_flag, create_by, create_site, create_time, update_by, update_site, update_time
+        select id, dest_code, dest_name, dest_name_en, status, line_code, country, site_code, province, city, county, town, is_hinterland, country_area_id, remark, tenant_id, del_flag, create_by, create_site, create_time, update_by, update_site, update_time
         from emis_destination a
         where a.id = #{id}
     </select>
@@ -110,6 +111,7 @@
             <if test="county != null and county != ''">county,</if>
             <if test="town != null and town != ''">town,</if>
             <if test="isHinterland != null">is_hinterland,</if>
+            <if test="countryAreaId != null">country_area_id,</if>
             <if test="remark != null and remark != ''">remark,</if>
             <if test="tenantId != null and tenantId != ''">tenant_id,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
@@ -134,6 +136,7 @@
             <if test="county != null and county != ''">#{county},</if>
             <if test="town != null and town != ''">#{town},</if>
             <if test="isHinterland != null">#{isHinterland},</if>
+            <if test="countryAreaId != null">#{countryAreaId},</if>
             <if test="remark != null and remark != ''">#{remark},</if>
             <if test="tenantId != null and tenantId != ''">#{tenantId},</if>
             <if test="delFlag != null and delFlag != ''">#{delFlag},</if>
@@ -161,6 +164,7 @@
             <if test="county != null and county != ''">county = #{county},</if>
             <if test="town != null and town != ''">town = #{town},</if>
             <if test="isHinterland != null">is_hinterland = #{isHinterland},</if>
+            <if test="countryAreaId != null">country_area_id = #{countryAreaId},</if>
             <if test="remark != null and remark != ''">remark = #{remark},</if>
             <if test="tenantId != null and tenantId != ''">tenant_id = #{tenantId},</if>
             <if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>