diff --git a/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java b/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java index 2e8ab7d..3f88e99 100644 --- a/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java +++ b/src/main/java/com/gxwebsoft/credit/entity/CreditJudgmentDebtor.java @@ -35,6 +35,9 @@ public class CreditJudgmentDebtor implements Serializable { @Schema(description = "被执行人名称") private String name; + @Schema(description = "被执行人") + private String name1; + @Schema(description = "证件号/组织机构代码") private String code; diff --git a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCompanyMapper.xml b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCompanyMapper.xml index 1051282..a9e1c0c 100644 --- a/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCompanyMapper.xml +++ b/src/main/java/com/gxwebsoft/credit/mapper/xml/CreditCompanyMapper.xml @@ -188,9 +188,11 @@ AND a.create_time <= #{param.createTimeEnd} - AND (a.comments LIKE CONCAT('%', #{param.keywords}, '%') - ) - + AND (a.name LIKE CONCAT('%', #{param.keywords}, '%') + OR a.match_name LIKE CONCAT('%', #{param.keywords}, '%') + OR a.code = #{param.keywords} + ) + diff --git a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java index 3d88a73..41b6708 100644 --- a/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java +++ b/src/main/java/com/gxwebsoft/credit/param/CreditJudgmentDebtorImportParam.java @@ -18,6 +18,9 @@ public class CreditJudgmentDebtorImportParam implements Serializable { @Excel(name = "被执行人名称") private String name; + @Excel(name = "被执行人") + private String name1; + @Excel(name = "证件号/组织机构代码") private String code;