From a8c00a4db043578da7b3a5bb79abb55e0dc19c49 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Thu, 11 Jan 2024 13:29:01 +0800
Subject: [PATCH] md

---
 .../java/com/xdadan/erp/emis/domain/EmisDestination.java | 7 ++++---
 .../src/main/resources/mapper/EmisDestinationMapper.xml  | 9 +++++++--
 2 files changed, 11 insertions(+), 5 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 34d40cf45..7d73443b9 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
@@ -2,7 +2,7 @@
  * @Project: emis
  * @Title: EmisDestination.java
  * @author linfso
- * @date 2024-01-11 05:16:09
+ * @date 2024-01-11 05:28:11
  * @Copyright: ShangHai Duta 2022 All rights reserved.
  * @version v1.0
  * @Description: <p> 目的地 实体类 </p>
@@ -25,7 +25,7 @@ import lombok.Data;
  * @ClassName EmisDestination
  * @Description 目的地
  * @author linfso
- * @date 2024-01-11 05:16:09
+ * @date 2024-01-11 05:28:11
  */
 @Data
 public class EmisDestination extends BaseEntity
@@ -56,7 +56,8 @@ public class EmisDestination extends BaseEntity
     private String county;
     /* 乡镇 */
     private String town;
-
+    /* 是否偏远地区 0-否 1-是 */
+    private Integer isHinterland;
     /* 创建网点 */
     private String createSite;
     /* 更新网点 */
diff --git a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
index 4e5752e25..7a9b4eb03 100644
--- a/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisDestinationMapper.xml
@@ -17,6 +17,7 @@
         <result property="city"    column="city"    />
         <result property="county"    column="county"    />
         <result property="town"    column="town"    />
+        <result property="isHinterland"    column="is_ hinterland"    />
         <result property="remark"    column="remark"    />
         <result property="tenantId"    column="tenant_id"    />
         <result property="delFlag"    column="del_flag"    />
@@ -29,7 +30,7 @@
     </resultMap>
 
     <sql id="selectEmisDestinationVo">
-        select id, dest_code, dest_name, dest_name_en, status, country, site_code, site_name, province, city, county, town, 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, country, site_code, site_name, 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
     </sql>
 
     <select id="selectEmisDestinationList" parameterType="EmisDestination" resultMap="EmisDestinationResult">
@@ -47,6 +48,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="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>
             <if test="delFlag != null  and delFlag != ''"> and del_flag like concat('%', #{delFlag}, '%')</if>
@@ -61,7 +63,7 @@
     </select>
 
     <select id="selectEmisDestinationById" parameterType="Long" resultMap="EmisDestinationResult">
-        select id, dest_code, dest_name, dest_name_en, status, country, site_code, site_name, province, city, county, town, 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, country, site_code, site_name, 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 a
         where a.id = #{id}
     </select>
@@ -81,6 +83,7 @@
             <if test="city != null and city != ''">city,</if>
             <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="remark != null and remark != ''">remark,</if>
             <if test="tenantId != null and tenantId != ''">tenant_id,</if>
             <if test="delFlag != null and delFlag != ''">del_flag,</if>
@@ -104,6 +107,7 @@
             <if test="city != null and city != ''">#{city},</if>
             <if test="county != null and county != ''">#{county},</if>
             <if test="town != null and town != ''">#{town},</if>
+            <if test="isHinterland != null">#{isHinterland},</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>
@@ -130,6 +134,7 @@
             <if test="city != null and city != ''">city = #{city},</if>
             <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="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>