From a5504c85deb9c1e333ac938cba9ac64828dfa538 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 15 Nov 2024 10:32:19 +0800
Subject: [PATCH] =?UTF-8?q?11/15=20=E4=BE=9B=E5=BA=94=E5=95=86=E9=80=89?=
 =?UTF-8?q?=E5=85=A5=E8=8D=AF=E5=93=81=E4=BC=98=E5=8C=961.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/req/thrsys/FilterThrProductsRequest.java    |  2 ++
 .../mybatis/mapper/thrsys/ThrProductsAddDiDao.xml   | 13 +++++++++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java
index 8298ff80..42507df5 100644
--- a/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java
+++ b/src/main/java/com/glxp/api/req/thrsys/FilterThrProductsRequest.java
@@ -57,4 +57,6 @@ public class FilterThrProductsRequest extends ListPageRequest {
     private Integer productsType ;
     private Integer productType ;
 
+    private String keyWords;
+
 }
diff --git a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
index 2c9f851d..d8d32110 100644
--- a/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
+++ b/src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml
@@ -213,7 +213,7 @@
                 AND tdi.internalMaterialCode like concat('%', #{internalMaterialCode}, '%')
             </if>
             <if test="spec != '' and spec != null">
-                AND tdi.spec = #{spec}
+                AND tdi.spec like concat('%', #{spec}, '%'))
             </if>
             <if test="checkStatus != null">
                 AND tdi.status = #{checkStatus}
@@ -222,7 +222,16 @@
                 AND tdi.customerId = #{customerId}
             </if>
             <if test="registerNo != '' and registerNo != null">
-                AND tdi.registerNo = #{registerNo}
+                AND tdi.registerNo like concat('%', #{registerNo}, '%')
+            </if>
+            <if test="keyWords != '' and keyWords != null">
+                AND (
+                   tdi.sptm like concat('%', #{keyWords}, '%')
+                or tdi.code like concat('%', #{keyWords}, '%')
+                or tdi.ybbm like concat('%', #{keyWords}, '%')
+                or tdi.name like concat('%', #{keyWords}, '%')
+                or tdi.registerNo like concat('%', #{keyWords}, '%')
+                or tdi.spec like concat('%', #{keyWords}, '%'))
             </if>
         </where>
         order by tdi.createTime DESC