From 3ec7221a6851c054a31e10a063e4f10249d36cf7 Mon Sep 17 00:00:00 2001
From: wangpengfei <1928057482@qq.com>
Date: Wed, 8 Jan 2025 08:39:05 +0800
Subject: [PATCH] 01-08

---
 .../java/com/yxt/goods/apiadmin/GoodsSpuRest.java    |  6 ++++++
 .../com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml    |  2 +-
 .../com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java   |  1 +
 .../com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml    |  9 ++++++++-
 .../com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java    |  2 ++
 .../com/yxt/goods/biz/goodsspu/GoodsSpuService.java  | 12 ++++++++++++
 6 files changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/yxt/goods/apiadmin/GoodsSpuRest.java b/src/main/java/com/yxt/goods/apiadmin/GoodsSpuRest.java
index 7bab1c1..2f48aa0 100644
--- a/src/main/java/com/yxt/goods/apiadmin/GoodsSpuRest.java
+++ b/src/main/java/com/yxt/goods/apiadmin/GoodsSpuRest.java
@@ -50,6 +50,12 @@ public class GoodsSpuRest {
     public ResultBean<List<GoodsSpuVo>> listAll(@RequestBody OrgPathQuery query) {
         return goodsSpuService.listAll(query);
     }
+    @ApiOperation("查询所有")
+    @PostMapping("/listAllByQuery")
+    public ResultBean<List<GoodsSpuVo>> listAllByQuery(@RequestBody GoodsSpuQuery query) {
+        return goodsSpuService.listAllByQuery(query);
+    }
+
     @ApiOperation("保存修改")
     @PostMapping("/saveOrUpdate")
     public ResultBean<String> saveOrUpdate(@RequestBody GoodsSpuDto dto) {
diff --git a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
index ac99e39..26cb722 100644
--- a/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodssku/GoodsSkuMapper.xml
@@ -37,7 +37,7 @@
         </where>
     </select>
     <select id="listAllByOrg" resultType="com.yxt.goods.biz.goodssku.GoodsSkuVo">
-        select a.*
+        select a.*,b.goodsName as goodsName
         from goods_sku a
         left join  goods_spu b on b.sid =a.goodsSpuSid
         LEFT JOIN ss_user.sys_organization as s ON b.useOrgSid = s.sid
diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java
index 24e82f5..b3afa11 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.java
@@ -21,6 +21,7 @@ public interface GoodsSpuMapper extends BaseMapper<GoodsSpu> {
     GoodsSpuVo initialization(@Param("sid")String sid);
     int updateBySidIsDelete(List<String> list);
     List<GoodsSpuVo> listAll(@Param("orgPath")String orgPath);
+    List<GoodsSpuVo> listAllByQuery(@Param(Constants.WRAPPER) QueryWrapper<GoodsSpu> qw);
     GoodsSpuVo getGoodsByOrgAndCode(@Param("orgPath")String orgPath,@Param("goodsCode")String goodsCode);
 
     IPage<SalesGoodsVo> getGoodsForSales(IPage<GoodsSpu> page, @Param(Constants.WRAPPER) QueryWrapper<GoodsSpu> qw);
diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml
index e4359ca..2f0ace9 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuMapper.xml
@@ -25,7 +25,14 @@
             s.orgSidPath like concat('%',#{orgPath},'%') and a.isDelete !='1' and a.isEnable='1'
         </where>
     </select>
-
+    <select id="listAllByQuery" resultType="com.yxt.goods.biz.goodsspu.GoodsSpuVo">
+        select
+        *
+        from goods_spu a
+        <where>
+            ${ew.sqlSegment}
+        </where>
+    </select>
     <select id="initialization" resultType="com.yxt.goods.biz.goodsspu.GoodsSpuVo">
         select DISTINCT
         s.*,a.goodsTypeName as typeName,b.brandName as brandName,c.manufacturerName as manufacturerName
diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java
index 7a8e239..d403a51 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuQuery.java
@@ -39,4 +39,6 @@ public class GoodsSpuQuery implements Query {
     @ApiModelProperty("用户sid")
     private String userSid;
     private int index;
+    private String brandSid;
+    private String typeSid;
 }
diff --git a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
index 61f5e33..69c831d 100644
--- a/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
+++ b/src/main/java/com/yxt/goods/biz/goodsspu/GoodsSpuService.java
@@ -148,6 +148,18 @@ public class GoodsSpuService extends MybatisBaseService<GoodsSpuMapper, GoodsSpu
         List<GoodsSpuVo> pagging = baseMapper.listAll(query.getOrgPath());
         return rb.success().setData(pagging);
     }
+    public ResultBean<List<GoodsSpuVo>> listAllByQuery(GoodsSpuQuery query) {
+        ResultBean rb = ResultBean.fireFail();
+        QueryWrapper<GoodsSpu> qw = new QueryWrapper<>();
+        if(StringUtils.isNotBlank(query.getBrandSid())){
+            qw.eq("brandSid",query.getBrandSid());
+        }
+        if(StringUtils.isNotBlank(query.getTypeSid())){
+            qw.eq("goodsTypeSid",query.getTypeSid());
+        }
+        List<GoodsSpuVo> vos=baseMapper.listAllByQuery(qw);
+        return rb.success().setData(vos);
+    }
     @Transactional
     public ResultBean<String> saveOrUpdate(GoodsSpuDto dto) {
         ResultBean rb = ResultBean.fireFail();