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 @@ 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}, '%') ) 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 = "公开日期")