From cb529fe09e49c105d8f9bb8179a3e4f494beb9b4 Mon Sep 17 00:00:00 2001
From: Claude Lee <calee2005@outlook.com>
Date: Mon, 23 Sep 2024 13:59:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=BD=E5=AE=B6=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=BB=93=E6=9E=84=EF=BC=8C=E6=B7=BB=E5=8A=A0=E4=BA=A7?=
 =?UTF-8?q?=E5=93=81=E7=BA=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/dhc/domain/DhcCountry.java | 14 +++++++++++++-
 .../main/resources/mapper/dhc/DhcCountryMapper.xml |  7 ++++++-
 sql/基础功能.sql                               |  1 +
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcCountry.java b/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcCountry.java
index d28972f..24b8b10 100644
--- a/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcCountry.java
+++ b/ruoyi-plan/src/main/java/com/ruoyi/dhc/domain/DhcCountry.java
@@ -26,6 +26,9 @@ public class DhcCountry extends BaseEntity
     @Excel(name = "国家名称")
     private String countryName;
 
+    @Excel(name = "产品线编码")
+    private String productLineCode;
+
     /** 销售大区id */
     @Excel(name = "销售大区id")
     private Long areaIdLarge;
@@ -72,12 +75,21 @@ public class DhcCountry extends BaseEntity
     {
         return countryName;
     }
+
+    public String getProductLineCode() {
+        return productLineCode;
+    }
+
+    public void setProductLineCode(String productLineCode) {
+        this.productLineCode = productLineCode;
+    }
+
     public void setAreaIdLarge(Long areaIdLarge) 
     {
         this.areaIdLarge = areaIdLarge;
     }
 
-    public Long getAreaIdLarge() 
+    public Long getAreaIdLarge()
     {
         return areaIdLarge;
     }
diff --git a/ruoyi-plan/src/main/resources/mapper/dhc/DhcCountryMapper.xml b/ruoyi-plan/src/main/resources/mapper/dhc/DhcCountryMapper.xml
index ca33788..1cea4a0 100644
--- a/ruoyi-plan/src/main/resources/mapper/dhc/DhcCountryMapper.xml
+++ b/ruoyi-plan/src/main/resources/mapper/dhc/DhcCountryMapper.xml
@@ -8,6 +8,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="countryId"    column="country_id"    />
         <result property="countryCode"    column="country_code"    />
         <result property="countryName"    column="country_name"    />
+        <result property="productLineCode" column="product_line_code" />
         <result property="areaIdLarge"    column="area_id_large"    />
         <result property="areaNameLarge"    column="area_name_large"    />
         <result property="areaIdSmall"    column="area_id_small"    />
@@ -20,7 +21,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectDhcCountryVo">
-        select country_id, country_code, country_name, area_id_large, area_name_large, area_id_small, area_name_small, del_flag, create_by, create_time, update_by, update_time from dhc_country
+        select country_id, country_code, country_name, product_line_code, area_id_large, area_name_large, area_id_small, area_name_small, del_flag, create_by, create_time, update_by, update_time from dhc_country
     </sql>
 
     <select id="selectDhcCountryList" parameterType="DhcCountry" resultMap="DhcCountryResult">
@@ -29,6 +30,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="delFlag != null  and delFlag != ''"> and del_flag = #{delFlag}</if>
             <if test="countryCode != null  and countryCode != ''"> and country_code like concat('%', #{countryCode}, '%')</if>
             <if test="countryName != null  and countryName != ''"> and country_name like concat('%', #{countryName}, '%')</if>
+            <if test="productLineCode != null and productLineCode != ''">and product_line_code = #{productLineCode}</if>
             <if test="areaIdLarge != null "> and area_id_large = #{areaIdLarge}</if>
             <if test="areaNameLarge != null  and areaNameLarge != ''"> and area_name_large = #{areaNameLarge}</if>
             <if test="areaIdSmall != null "> and area_id_small = #{areaIdSmall}</if>
@@ -46,6 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="(" suffix=")" suffixOverrides=",">
             <if test="countryCode != null">country_code,</if>
             <if test="countryName != null">country_name,</if>
+            <if test="productLineCode != null">product_line_code,</if>
             <if test="areaIdLarge != null">area_id_large,</if>
             <if test="areaNameLarge != null">area_name_large,</if>
             <if test="areaIdSmall != null">area_id_small,</if>
@@ -59,6 +62,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="countryCode != null">#{countryCode},</if>
             <if test="countryName != null">#{countryName},</if>
+            <if test="productLineCode != null">#{productLineCode},</if>
             <if test="areaIdLarge != null">#{areaIdLarge},</if>
             <if test="areaNameLarge != null">#{areaNameLarge},</if>
             <if test="areaIdSmall != null">#{areaIdSmall},</if>
@@ -76,6 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <trim prefix="SET" suffixOverrides=",">
             <if test="countryCode != null">country_code = #{countryCode},</if>
             <if test="countryName != null">country_name = #{countryName},</if>
+            <if test="productLineCode != null">product_line_code = #{productLineCode},</if>
             <if test="areaIdLarge != null">area_id_large = #{areaIdLarge},</if>
             <if test="areaNameLarge != null">area_name_large = #{areaNameLarge},</if>
             <if test="areaIdSmall != null">area_id_small = #{areaIdSmall},</if>
diff --git a/sql/基础功能.sql b/sql/基础功能.sql
index 5f3c0c8..c879db2 100644
--- a/sql/基础功能.sql
+++ b/sql/基础功能.sql
@@ -66,6 +66,7 @@ create table dhc_country (
   country_id           bigint(20)      not null auto_increment    comment '国家id',
   country_code         varchar(32)     default ''                 comment '国家编码',
   country_name         varchar(64)     default ''                 comment '国家名称',
+  product_line_code         varchar(32)       NOT NULL                 comment '产品线编码',
   area_id_large         bigint(20)                      comment '销售大区id',
   area_name_large         varchar(64)     default ''                 comment '销售大区名称',
   area_id_small       bigint(20)                      comment '销售小区id',