From 5f3ae0f9f107a142f438ff9fadf0010d6b263fec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B1=88=E5=B1=95=E8=88=AA?= <2426745133@qq.com>
Date: Sat, 25 Oct 2025 21:22:36 +0800
Subject: [PATCH] =?UTF-8?q?10-25-=E4=BE=9B=E5=BA=94=E5=95=86=E5=9C=B0?=
 =?UTF-8?q?=E5=9F=9F=E7=BB=91=E5=AE=9A=E5=8F=8A=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dromara/xzd/domain/XzdSupplierInfo.java   | 14 ++++++++----
 .../xzd/domain/bo/XzdSupplierInfoBo.java      | 22 ++++++++++++-------
 .../xzd/domain/vo/XzdSupplierInfoVo.java      |  5 +++++
 .../mapper/xzd/XzdSupplierInfoMapper.xml      |  5 +++++
 4 files changed, 34 insertions(+), 12 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java
index 88fd00a2..f2ce057e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/XzdSupplierInfo.java
@@ -1,14 +1,15 @@
 package org.dromara.xzd.domain;
 
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import java.util.Date;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.io.Serial;
+import java.util.Date;
 
 /**
  * 供应商信息对象 xzd_supplier_info
@@ -30,6 +31,11 @@ public class XzdSupplierInfo extends BaseEntity {
     @TableId(value = "id")
     private Long id;
 
+    /**
+     * 区域编码
+     */
+    private String cityCode;
+
     /**
      * 单位编号
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java
index c809742c..584e0383 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/bo/XzdSupplierInfoBo.java
@@ -1,19 +1,20 @@
 package org.dromara.xzd.domain.bo;
 
-import org.dromara.xzd.domain.*;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.xzd.domain.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
 import java.util.Date;
 import java.util.List;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-
 /**
  * 供应商信息业务对象 xzd_supplier_info
  *
@@ -30,6 +31,11 @@ public class XzdSupplierInfoBo extends BaseEntity {
      */
     private Long id;
 
+    /**
+     * 区域编码
+     */
+    private String cityCode;
+
     /**
      * 单位编号
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java
index 2ddd82d8..9d05ff92 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/xzd/domain/vo/XzdSupplierInfoVo.java
@@ -36,6 +36,11 @@ public class XzdSupplierInfoVo implements Serializable {
     @ExcelProperty(value = "")
     private Long id;
 
+    /**
+     * 区域编码
+     */
+    private String cityCode;
+
     /**
      * 单位编号
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml
index 74cc45e6..47da1a1d 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/resources/mapper/xzd/XzdSupplierInfoMapper.xml
@@ -10,6 +10,7 @@
         supplement.belonging_organization as sszz,
 #         settlement.opening_bank as khyh,
 #         settlement.account_number as khhzh,
+        info.city_code as cityCode,
         bank.open_bank as khyh,
         bank.account as khhzh,
         supplement.creator as createByUser,
@@ -45,6 +46,10 @@
                 AND info.unit_name LIKE CONCAT('%', #{bo.unitName}, '%')
             </if>
 
+             <if test='bo.cityCode != null and bo.cityCode != ""'>
+                AND info.city_code = #{cityCode}
+            </if>
+
             <if test='bo.fgbm != null and bo.fgbm != ""'>
                 AND supplement.responsible_department = #{bo.fgbm}
             </if>