From d819f4fb0cd5a01e82e15509b22e1fbe6b36726f Mon Sep 17 00:00:00 2001
From: donqi <ydq0308@qq.com>
Date: Wed, 8 Jun 2022 13:58:41 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9F=A5=E8=AF=A2goods?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/controller/goods/GoodsController.java |  2 +-
 .../main/java/com/ghy/goods/domain/Goods.java |  3 +++
 .../resources/mapper/goods/GoodsMapper.xml    | 23 +++++++++++++++++--
 3 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
index 4e0fb6d0..fce2f0b8 100644
--- a/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
+++ b/ghy-admin/src/main/java/com/ghy/web/controller/goods/GoodsController.java
@@ -46,7 +46,7 @@ public class GoodsController extends BaseController {
 //    @RequiresPermissions("goods:goods:list")
     @PostMapping("/list")
     @ResponseBody
-    public TableDataInfo list(Goods goods) {
+    public TableDataInfo list(@RequestBody Goods goods) {
         startPage();
         List<Goods> list = goodsService.selectGoodsList(goods);
         list.forEach(one->{
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 ed634136..e390305f 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
@@ -48,6 +48,9 @@ public class Goods extends BaseEntity {
     @Excel(name = "状态", readConverterExp = "0=上架,1=下架,2删除")
     private Integer status;
 
+    @Excel(name = "区域Id", cellType = Excel.ColumnType.NUMERIC)
+    private Long areaId;
+
     private List<GoodsArea> goodsAreaList;
 
     private Map<Integer, List<GoodsImgs>> goodsImgsMap;
diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
index 4813cfea..45cad854 100644
--- a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -26,6 +26,12 @@
                dept_goods_category_id, goods_img_url, goods_video_url, status, create_by, create_time, remark
         FROM goods
     </sql>
+    <sql id="selectGoodsWithArea">
+        SELECT DISTINCT g.goods_id, goods_code, dept_id, goods_name, goods_sort, worker_id,
+               dept_goods_category_id, goods_img_url, goods_video_url, status, create_by, create_time, remark
+        FROM goods g
+        LEFT JOIN goods_area ga ON g.goods_id = ga.goods_id
+    </sql>
 
     <update id="updateGoods" parameterType="com.ghy.goods.domain.Goods">
         UPDATE goods
@@ -80,7 +86,7 @@
     </insert>
 
     <select id="selectGoodsList" parameterType="com.ghy.goods.domain.Goods" resultMap="GoodsResult">
-        <include refid="selectGoods" />
+        <include refid="selectGoodsWithArea" />
         <where>
             <if test="goodsCode != null and goodsCode != ''">
                 AND goods_code like concat('%', #{goodsCode}, '%')
@@ -88,7 +94,20 @@
             <if test="deptGoodsCategoryId != null and deptGoodsCategoryId != ''">
                 AND dept_goods_category_id = #{deptGoodsCategoryId}
             </if>
+            <if test="areaId != null and areaId != ''">
+                AND country_area_id = #{areaId}
+            </if>
+            <if test="goodsName != null and goodsName != ''">
+                AND goods_name like concat('%', #{goodsName}, '%')
+            </if>
         </where>
+        /* 默认生成时间排序 */
+        order by create_time
+        <trim suffixOverrides=",">
+            <if test="params.createTimeSort != null and params.createTimeSort != ''">
+                ${params.createTimeSort}
+            </if>
+        </trim>
     </select>
 
     <select id="selectById" parameterType="long" resultMap="GoodsResult">
@@ -137,4 +156,4 @@
             #{ids}
         </foreach>
     </select>
-</mapper>
\ No newline at end of file
+</mapper>