From 751c34f39dca2e42174317c85db819cf0b8df70c Mon Sep 17 00:00:00 2001
From: James Zow <Jameszow@163.com>
Date: Mon, 27 May 2024 20:51:41 +0800
Subject: [PATCH] Fix keyword query errors

---
 .../mapper_xml/product/ProductStockMapper.xml | 31 ++++++++++++++++---
 .../product/QueryProductStockKeepUnitDTO.java |  2 ++
 .../product/impl/ProductServiceImpl.java      |  7 +++++
 3 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/core/dao/src/main/resources/mapper_xml/product/ProductStockMapper.xml b/core/dao/src/main/resources/mapper_xml/product/ProductStockMapper.xml
index 7116ae40..7cfb1210 100644
--- a/core/dao/src/main/resources/mapper_xml/product/ProductStockMapper.xml
+++ b/core/dao/src/main/resources/mapper_xml/product/ProductStockMapper.xml
@@ -21,11 +21,26 @@
     </resultMap>
 
     <select id="getProductSkuList" resultMap="productResultMap" parameterType="com.baomidou.mybatisplus.core.metadata.IPage">
-        SELECT ps.id, p.id AS productId, p.product_category_id, p.product_name, p.product_model, p.product_standard, p.product_color,
-        sku.product_bar_code, sku.multi_attribute, sku.product_unit, sku.retail_price, sku.sale_price, sku.purchase_price, p.product_manufacturer,pc.category_name,
-        ps.current_stock_quantity, w.warehouse_name, ps.warehouse_id
+        SELECT ps.id,
+        p.id AS productId,
+        p.product_category_id,
+        p.product_name,
+        p.product_model,
+        p.product_standard,
+        p.product_color,
+        sku.product_bar_code,
+        sku.multi_attribute,
+        sku.product_unit,
+        sku.retail_price,
+        sku.sale_price,
+        sku.purchase_price,
+        p.product_manufacturer,
+        pc.category_name,
+        ps.current_stock_quantity,
+        w.warehouse_name,
+        ps.warehouse_id
         FROM product_stock AS ps
-        LEFT JOIN warehouse as w ON ps.warehouse_id = w.id
+        LEFT JOIN warehouse AS w ON ps.warehouse_id = w.id
         LEFT JOIN product_sku AS sku ON sku.id = ps.product_sku_id
         LEFT JOIN product AS p ON sku.product_id = p.id
         LEFT JOIN product_category AS pc ON p.product_category_id = pc.id
@@ -45,6 +60,14 @@
             <if test="queryProductStockKeepUnitDTO.enableBatchNumber != null">
                 AND p.enable_batch_number = #{queryProductStockKeepUnitDTO.enableBatchNumber}
             </if>
+            <if test="queryProductStockKeepUnitDTO.keywords != null">
+                AND (
+                p.product_name LIKE CONCAT('%', #{queryProductStockKeepUnitDTO.keywords}, '%')
+                OR p.product_standard LIKE CONCAT('%', #{queryProductStockKeepUnitDTO.keywords}, '%')
+                OR p.product_model LIKE CONCAT('%', #{queryProductStockKeepUnitDTO.keywords}, '%')
+                OR p.product_color LIKE CONCAT('%', #{queryProductStockKeepUnitDTO.keywords}, '%')
+                )
+            </if>
         </where>
     </select>
 
diff --git a/core/domain/src/main/java/com/wansenai/dto/product/QueryProductStockKeepUnitDTO.java b/core/domain/src/main/java/com/wansenai/dto/product/QueryProductStockKeepUnitDTO.java
index 38168353..dbeaf3d9 100644
--- a/core/domain/src/main/java/com/wansenai/dto/product/QueryProductStockKeepUnitDTO.java
+++ b/core/domain/src/main/java/com/wansenai/dto/product/QueryProductStockKeepUnitDTO.java
@@ -30,4 +30,6 @@ public class QueryProductStockKeepUnitDTO {
     private Long page;
 
     private Long pageSize;
+
+    private String keywords;
 }
diff --git a/core/service/src/main/java/com/wansenai/service/product/impl/ProductServiceImpl.java b/core/service/src/main/java/com/wansenai/service/product/impl/ProductServiceImpl.java
index 68980643..398b068b 100644
--- a/core/service/src/main/java/com/wansenai/service/product/impl/ProductServiceImpl.java
+++ b/core/service/src/main/java/com/wansenai/service/product/impl/ProductServiceImpl.java
@@ -280,6 +280,13 @@ public Response<Page<ProductVO>> getProductInfo(QueryProductDTO queryProductDTO)
                 .like(StringUtils.hasLength(queryProductDTO.getExtendInfo()), Product::getOtherFieldOne, queryProductDTO.getExtendInfo())
                 .like(StringUtils.hasLength(queryProductDTO.getRemark()), Product::getRemark, queryProductDTO.getRemark())
                 .like(StringUtils.hasLength(queryProductDTO.getWarehouseShelves()), Product::getWarehouseShelves, queryProductDTO.getWarehouseShelves())
+                .like(StringUtils.hasLength(queryProductDTO.getKeywords()), Product::getProductName, queryProductDTO.getKeywords())
+                .or()
+                .like(StringUtils.hasLength(queryProductDTO.getKeywords()), Product::getProductStandard, queryProductDTO.getKeywords())
+                .or()
+                .like(StringUtils.hasLength(queryProductDTO.getKeywords()), Product::getProductModel, queryProductDTO.getKeywords())
+                .or()
+                .like(StringUtils.hasLength(queryProductDTO.getKeywords()), Product::getProductColor, queryProductDTO.getKeywords())
                 .eq(queryProductDTO.getProductCategoryId() != null, Product::getProductCategoryId, queryProductDTO.getProductCategoryId())
                 .eq(queryProductDTO.getStatus() != null, Product::getStatus, queryProductDTO.getStatus())
                 .eq(queryProductDTO.getEnableSerialNumber() != null, Product::getEnableSerialNumber, queryProductDTO.getEnableSerialNumber())