From c7cfaf1adbe3d29879744ead52f1d89e0f0884d1 Mon Sep 17 00:00:00 2001
From: wangxy <1356089412@qq.com>
Date: Wed, 21 Aug 2024 14:27:13 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=9F=A5=E8=AF=A2=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/system/domain/carrier/TdCarrier.java   | 12 +++++++++++-
 .../main/resources/mapper/system/TdCarrierMapper.xml | 10 +++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrier.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrier.java
index e134f23..f6851c3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrier.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/carrier/TdCarrier.java
@@ -165,7 +165,7 @@ public class TdCarrier extends BaseEntity {
     private Date destoryDate;
 
     /**
-     * 销毁方式
+     * 销毁方式 区县
      */
     private String destoryManner;
 
@@ -174,6 +174,16 @@ public class TdCarrier extends BaseEntity {
      */
     private String status;
 
+    /**
+     * 市州
+     */
+    private String areaCity;
+
+    /**
+     * 区县
+     */
+    private String areaDistrict;
+
 
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
diff --git a/ruoyi-system/src/main/resources/mapper/system/TdCarrierMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TdCarrierMapper.xml
index 32f53f2..9585999 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TdCarrierMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TdCarrierMapper.xml
@@ -41,6 +41,8 @@
             <result property="updateBy" column="update_by" jdbcType="VARCHAR"/>
             <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
             <result property="remark" column="remark" jdbcType="VARCHAR"/>
+            <result property="areaCity" column="area_city" jdbcType="VARCHAR"/>
+            <result property="areaDistrict" column="area_district" jdbcType="VARCHAR"/>
     </resultMap>
 
     <sql id="Base_Column_List">
@@ -55,7 +57,7 @@
         maintain_date,destory_depart,destory_user,
         destory_date,destory_manner,status,
         create_by,create_time,update_by,
-        update_time,remark,carrier_name
+        update_time,remark,carrier_name,area_city,area_district
     </sql>
     <select id="selectTdCarrierList" resultType="com.ruoyi.system.domain.carrier.TdCarrier">
         select  <include refid="Base_Column_List"/> from  td_carrier
@@ -75,6 +77,12 @@
             <if test="carrierNumber!=null and carrierNumber!=''">
                 AND carrier_number = #{carrierNumber}
             </if>
+            <if test="areaCity!=null and areaCity!=''">
+                AND area_city = #{areaCity}
+            </if>
+            <if test="areaDistrict!=null and areaDistrict!=''">
+                AND area_district = #{areaDistrict}
+            </if>
             <if test="status!=null and status!=''">
                 AND status = #{status}
             </if>