From 9791ab6530e0c0114b7eec9aac313e1d543fdd00 Mon Sep 17 00:00:00 2001
From: Hawking <hhawking@qq.com>
Date: Sun, 16 Apr 2023 14:49:02 +0800
Subject: [PATCH] =?UTF-8?q?=E5=95=86=E5=93=81=E5=A2=9E=E5=8A=A0keyword?=
 =?UTF-8?q?=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java  | 5 +++--
 .../src/main/resources/mapper/goods/GoodsMapper.xml      | 9 +++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
index 44a29976..9a6a8468 100644
--- a/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
+++ b/ghy-goods/src/main/java/com/ghy/goods/domain/Goods.java
@@ -3,9 +3,8 @@ package com.ghy.goods.domain;
 import com.ghy.common.annotation.Excel;
 import com.ghy.common.core.domain.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
-import java.math.BigDecimal;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -15,6 +14,7 @@ import java.util.Map;
  * @author clunt
  */
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class Goods extends BaseEntity {
 
     private static final long serialVersionUID = 1L;
@@ -88,4 +88,5 @@ public class Goods extends BaseEntity {
 
     private List<String> lbUrl;
 
+    private String keyword;
 }
diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
index 25caeb30..3c2fb1fa 100644
--- a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -25,16 +25,18 @@
         <result property="updateTime"          column="update_time"   />
         <result property="remark"              column="remark"        />
         <result property="areaDesc"              column="area_desc"        />
+        <result property="keyword"             column="keyword"        />
     </resultMap>
 
     <sql id="selectGoods">
         SELECT goods_id, goods_code, dept_id, goods_name, goods_desc, warranty_period, serv_activity, goods_unit, expect_duration, goods_sort, worker_id,
-               dept_goods_category_id, goods_img_url, goods_video_url, status, create_by, create_time, remark, area_desc
+               dept_goods_category_id, goods_img_url, goods_video_url, status, create_by, create_time, remark, area_desc, keyword
         FROM goods
     </sql>
+
     <sql id="selectGoodsWithArea">
         SELECT DISTINCT g.goods_id, goods_code, dept_id, goods_name, goods_desc, goods_sort, worker_id, goods_unit, warranty_period, serv_activity, expect_duration,
-               dept_goods_category_id, goods_img_url, goods_video_url, status, g.create_by, g.create_time, g.remark, g.area_desc
+               dept_goods_category_id, goods_img_url, goods_video_url, status, g.create_by, g.create_time, g.remark, g.area_desc, g.keyword
         FROM goods g
         LEFT JOIN goods_area ga ON g.goods_id = ga.goods_id
     </sql>
@@ -149,6 +151,9 @@
             <if test="goodsId != null">
                 AND g.goods_id = #{goodsId}
             </if>
+            <if test="keyword != null and keyword != ''">
+                AND g.keyword LIKE concat('%', #{keyword}, '%')
+            </if>
         </where>
         /* 默认生成时间排序 */
         order by create_time