From 3a9be1da7beae228f4d86902952f03925cfaf3b6 Mon Sep 17 00:00:00 2001
From: Yen <yen1130@qq.com>
Date: Wed, 7 Aug 2024 17:58:53 +0800
Subject: [PATCH] =?UTF-8?q?opt:=20=E4=B8=8B=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=8B=93=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/goods/entity/so/GoodsImminentBatchQuery.java     | 1 +
 src/main/resources/mapper/goods/GoodsImminentBatchMapper.xml | 5 ++++-
 src/main/resources/mapper/goods/GoodsSpuMapper.xml           | 3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/qs/serve/modules/goods/entity/so/GoodsImminentBatchQuery.java b/src/main/java/com/qs/serve/modules/goods/entity/so/GoodsImminentBatchQuery.java
index 3e565f5e..28f5d47c 100644
--- a/src/main/java/com/qs/serve/modules/goods/entity/so/GoodsImminentBatchQuery.java
+++ b/src/main/java/com/qs/serve/modules/goods/entity/so/GoodsImminentBatchQuery.java
@@ -22,6 +22,7 @@ public class GoodsImminentBatchQuery {
 
     /** 供应商编码 */
     private String supplierCode;
+    private String spuCodeOrName;
 
     /** 选中的商品规则 */
     private String searchCateRuleId;
diff --git a/src/main/resources/mapper/goods/GoodsImminentBatchMapper.xml b/src/main/resources/mapper/goods/GoodsImminentBatchMapper.xml
index 06999b4c..1c9e6b7d 100644
--- a/src/main/resources/mapper/goods/GoodsImminentBatchMapper.xml
+++ b/src/main/resources/mapper/goods/GoodsImminentBatchMapper.xml
@@ -136,7 +136,10 @@
 
     <sql id="spuWherePart">
         <if test="query.spuName != null and query.spuName != ''"> and `goods_spu`.`name` like concat('%',#{query.spuName},'%') </if>
-        <if test="query.skuCode != null and query.skuCode != ''"> and `goods_spu`.`goods_spu` like concat('%',#{query.skuCode},'%') </if>
+        <if test="query.spuCodeOrName != null and query.spuCodeOrName != ''">
+         and (`goods_spu`.`name` like concat('%',#{query.spuCodeOrName},'%') or `goods_spu`.`spu_code` like concat('%',#{query.spuCodeOrName},'%'))
+        </if>
+        <if test="query.spuCode != null and query.spuCode != ''"> and `goods_spu`.`spu_code` like concat('%',#{query.spuCode},'%') </if>
         <if test="query.bookCodeList!=null and query.bookCodeList.size > 0">
             and `goods_spu`.`book_belong` in
             <foreach collection="query.bookCodeList" item ="selectId" index="i" open="(" close=")" separator=",">
diff --git a/src/main/resources/mapper/goods/GoodsSpuMapper.xml b/src/main/resources/mapper/goods/GoodsSpuMapper.xml
index 516aca38..3aae16a0 100644
--- a/src/main/resources/mapper/goods/GoodsSpuMapper.xml
+++ b/src/main/resources/mapper/goods/GoodsSpuMapper.xml
@@ -159,6 +159,9 @@
         and `goods_spu`.`del_flag` = 0
         <if test="query.id != null"> and `goods_spu`.`id` = #{query.id}</if>
         <if test="query.spuCode != null and query.spuCode != ''"> and `goods_spu`.`spu_code` like concat('%', #{query.spuCode},'%')</if>
+        <if test="query.spuCodeOrName != null and query.spuCodeOrName != ''">
+         and (`goods_spu`.`spu_code` like concat('%', #{query.spuCodeOrName},'%') or `goods_spu`.`spu_code` like concat('%', #{query.spuCodeOrName},'%') )
+         </if>
         <if test="query.name != null and query.name != ''"> and `goods_spu`.`name` like concat('%', #{query.name},'%') </if>
         <if test="query.categoryFirst != null"> and `goods_spu`.`category_first` = #{query.categoryFirst}</if>
         <if test="query.categorySecond != null"> and `goods_spu`.`category_second` = #{query.categorySecond}</if>