From 2b0e5d68164c895201ce70e7c0eb0f23c1bef2a2 Mon Sep 17 00:00:00 2001 From: luojiaquan <1583622118@qq.com> Date: Tue, 29 Sep 2026 15:04:13 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E7=AE=A1=E7=90=86=EF=BC=8C?= =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E7=AE=A1=E7=90=86=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customerinfo/domain/BmsCustomer.java | 24 ++++++++++++++ .../supplierinfo/domain/BmsSupplier.java | 23 +++++++++++++ .../mapper/customer/BmsCustomerMapper.xml | 10 ++++++ .../mapper/customer/BmsSupplierMapper.xml | 10 ++++++ .../customerinfo/index.vue | 32 +++++-------------- .../supplierinfo/index.vue | 31 +++++------------- 6 files changed, 83 insertions(+), 47 deletions(-) diff --git a/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomer.java b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomer.java index 1ef6206b..550372fe 100644 --- a/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomer.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/customerinfo/domain/BmsCustomer.java @@ -1,6 +1,8 @@ package com.bms.customer.customerinfo.domain; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Collections; import java.util.List; import lombok.Data; @@ -123,4 +125,26 @@ public class BmsCustomer extends BaseEntity /** 删除标记（0正常 2删除） */ private String delFlag; + /** 列表查询用：关键词多行文本（每行一个），对客户编码/名称/对外代码模糊匹配，行间为 OR；非表字段 */ + private String keywords; + + /** 供 MyBatis 动态 SQL 使用：按行拆分去空白后的关键词列表 */ + public List getKeywordList() + { + if (keywords == null || keywords.trim().isEmpty()) + { + return Collections.emptyList(); + } + List list = new ArrayList<>(); + for (String line : keywords.split("\\r?\\n")) + { + String s = line.trim(); + if (!s.isEmpty()) + { + list.add(s); + } + } + return list; + } + } diff --git a/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplier.java b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplier.java index fa9be7d4..2ce2eeb7 100644 --- a/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplier.java +++ b/bms-back/bms-system/src/main/java/com/bms/customer/supplierinfo/domain/BmsSupplier.java @@ -1,6 +1,8 @@ package com.bms.customer.supplierinfo.domain; import java.math.BigDecimal; +import java.util.ArrayList; +import java.util.Collections; import java.util.Date; import java.util.List; @@ -144,5 +146,26 @@ public class BmsSupplier extends BaseEntity /** 删除标记（0正常 2删除） */ private String delFlag; + /** 列表查询用：关键词多行文本（每行一个），对供应商编码/名称/对外代码模糊匹配，行间为 OR；非表字段 */ + private String keywords; + + /** 供 MyBatis 动态 SQL 使用：按行拆分去空白后的关键词列表 */ + public List getKeywordList() + { + if (keywords == null || keywords.trim().isEmpty()) + { + return Collections.emptyList(); + } + List list = new ArrayList<>(); + for (String line : keywords.split("\\r?\\n")) + { + String s = line.trim(); + if (!s.isEmpty()) + { + list.add(s); + } + } + return list; + } } diff --git a/bms-back/bms-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml b/bms-back/bms-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml index 399a23db..dc083557 100644 --- a/bms-back/bms-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/customer/BmsCustomerMapper.xml @@ -66,6 +66,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and c.customer_code = #{customerCode} and c.customer_name like concat('%', #{customerName}, '%') and c.customer_code_dw = #{customerCodeDw} + + + and ( + + (c.customer_code like concat('%', #{kw}, '%') + or c.customer_name like concat('%', #{kw}, '%') + or c.customer_code_dw like concat('%', #{kw}, '%')) + + ) + and c.credit_code = #{creditCode} and c.customer_type = #{customerType} and c.is_enable = #{isEnable} diff --git a/bms-back/bms-system/src/main/resources/mapper/customer/BmsSupplierMapper.xml b/bms-back/bms-system/src/main/resources/mapper/customer/BmsSupplierMapper.xml index ad57a837..0ffae371 100644 --- a/bms-back/bms-system/src/main/resources/mapper/customer/BmsSupplierMapper.xml +++ b/bms-back/bms-system/src/main/resources/mapper/customer/BmsSupplierMapper.xml @@ -60,6 +60,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and s.supplier_code = #{supplierCode} and s.supplier_name like concat('%', #{supplierName}, '%') and s.supplier_code_dw = #{supplierCodeDw} + + + and ( + + (s.supplier_code like concat('%', #{kw}, '%') + or s.supplier_name like concat('%', #{kw}, '%') + or s.supplier_code_dw like concat('%', #{kw}, '%')) + + ) + and s.credit_code = #{creditCode} and s.supplier_type = #{supplierType} and s.invoice_type = #{invoiceType} diff --git a/bms-front/src/views/customersuppliermanagement/customerinfo/index.vue b/bms-front/src/views/customersuppliermanagement/customerinfo/index.vue index bdcdb06c..6612abe1 100644 --- a/bms-front/src/views/customersuppliermanagement/customerinfo/index.vue +++ b/bms-front/src/views/customersuppliermanagement/customerinfo/index.vue @@ -1,29 +1,15 @@