From 546027e7a411258a97a5ca124e107dc017425ad8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Sat, 14 Feb 2026 11:29:05 +0800
Subject: [PATCH] =?UTF-8?q?fix(credit):=20=E4=BF=AE=E6=AD=A3=E4=BE=9B?=
 =?UTF-8?q?=E5=BA=94=E5=95=86=E5=AE=9E=E4=BD=93=E5=AD=97=E6=AE=B5=E6=8F=8F?=
 =?UTF-8?q?=E8=BF=B0=E5=B9=B6=E6=89=A9=E5=B1=95=E6=90=9C=E7=B4=A2=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 将CreditSupplier实体中的purchaseAmount字段描述从"销售金额"更正为"采购金额"
- 更新CreditSupplierImportParam参数类中相应字段的Excel注解描述
- 在CreditSupplierMapper.xml中扩展关键词搜索功能，增加对supplier字段的搜索支持
---
 src/main/java/com/gxwebsoft/credit/entity/CreditSupplier.java  | 2 +-
 .../com/gxwebsoft/credit/mapper/xml/CreditSupplierMapper.xml   | 3 ++-
 .../com/gxwebsoft/credit/param/CreditSupplierImportParam.java  | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditSupplier.java b/src/main/java/com/gxwebsoft/credit/entity/CreditSupplier.java
index ff461c9..ceb4ff0 100644
--- a/src/main/java/com/gxwebsoft/credit/entity/CreditSupplier.java
+++ b/src/main/java/com/gxwebsoft/credit/entity/CreditSupplier.java
@@ -39,7 +39,7 @@ public class CreditSupplier implements Serializable {
     @Schema(description = "状态")
     private String statusTxt;
 
-    @Schema(description = "销售金额(万元)")
+    @Schema(description = "采购金额(万元)")
     private String purchaseAmount;
 
     @Schema(description = "公开日期")
diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSupplierMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSupplierMapper.xml
index c5d3cdd..b57a639 100644
--- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSupplierMapper.xml
+++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditSupplierMapper.xml
@@ -59,7 +59,8 @@
             </if>
             <if test="param.keywords != null">
                 AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%')
-              OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
+                  OR b.name LIKE CONCAT('%', #{param.keywords}, '%')
+                  OR a.supplier LIKE CONCAT('%', #{param.keywords}, '%')
                 )
               </if>
         </where>
diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditSupplierImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditSupplierImportParam.java
index 7850a27..45ff9c0 100644
--- a/src/main/java/com/gxwebsoft/credit/param/CreditSupplierImportParam.java
+++ b/src/main/java/com/gxwebsoft/credit/param/CreditSupplierImportParam.java
@@ -18,7 +18,7 @@ public class CreditSupplierImportParam implements Serializable {
     @Excel(name = "状态")
     private String statusTxt;
 
-    @Excel(name = "销售金额(万元)")
+    @Excel(name = "采购金额(万元)")
     private String purchaseAmount;
 
     @Excel(name = "公开日期")