From 03782d19f386a02b7cce207dbb3a47ed9fe16447 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Mon, 18 Nov 2024 10:27:30 +0800
Subject: [PATCH] =?UTF-8?q?11/18=20=E5=85=B3=E8=81=94=E5=85=B3=E7=B3=BB?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/req/collect/RelCodeBatchRequest.java  |  5 +++++
 .../resources/mybatis/mapper/basic/UdiRlSupDao.xml     |  5 ++++-
 .../mybatis/mapper/collect/RelCodeBatchMapper.xml      | 10 ++++++++++
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java b/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java
index add1e5a9..f514eff6 100644
--- a/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java
+++ b/src/main/java/com/glxp/api/req/collect/RelCodeBatchRequest.java
@@ -95,4 +95,9 @@ public class RelCodeBatchRequest extends ListPageRequest {
 
     private String erpId;
     private String cpmctymc;
+
+    //模糊查询字段
+    private String keyWord;
+
+
 }
diff --git a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
index 896bd5ef..85dacea2 100644
--- a/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
+++ b/src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml
@@ -169,7 +169,9 @@
                 AND nameCode LIKE concat(#{nameCode}, '%')
             </if>
             <if test="ggxh != '' and ggxh != null">
-                AND ggxh LIKE concat('%', #{ggxh}, '%')
+                AND (
+                basic_products.ggxh LIKE concat('%', #{ggxh}, '%')
+                or basic_products.bzgg LIKE concat('%', #{ggxh}, '%'))
             </if>
             <if test="purType != '' and purType != null">
                 AND basic_udirel.purType = #{purType}
@@ -280,6 +282,7 @@
                 or basic_products.prepnSpec LIKE concat('%', #{keyWords}, '%')
                 or basic_products.cpmctymc LIKE concat('%', #{keyWords}, '%')
                 or basic_products.ggxh LIKE concat('%', #{keyWords}, '%')
+                or basic_products.zczbhhzbapzbh LIKE concat('%', #{keyWords}, '%')
                 or basic_products.manufactory LIKE concat('%', #{keyWords}, '%')
                 or basic_udirel.thirdId LIKE concat('%', #{keyWords}, '%')
                 or basic_udirel.thirdId1 LIKE concat('%', #{keyWords}, '%')
diff --git a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml
index 26b4d1cb..f1b9fc2d 100644
--- a/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml
+++ b/src/main/resources/mybatis/mapper/collect/RelCodeBatchMapper.xml
@@ -50,6 +50,16 @@
         or a.parentCode LIKE concat('%', #{keyWords}, '%')
         )
       </if>
+      <if test="keyWord != '' and keyWord != null">
+        AND (
+        a.productCode LIKE concat('%', #{keyWord}, '%')
+        or a.batchNo  LIKE concat('%', #{keyWord}, '%')
+        or bp.bzgg LIKE concat('%', #{keyWord}, '%')
+        or bp.packUnit LIKE concat('%', #{keyWord}, '%')
+        or bp.prepnSpec LIKE concat('%', #{keyWord}, '%')
+        or bp.cpmctymc LIKE concat('%', #{keyWord}, '%')
+        or bp.ggxh LIKE concat('%', #{keyWord}, '%'))
+      </if>
       <if test="lineName != '' and lineName != null">
         AND a.lineName LIKE concat('%', #{lineName}, '%')
       </if>