From 197359727bb86f25fc76ef2f57cc69e978635aa4 Mon Sep 17 00:00:00 2001
From: wxy <you@example.com>
Date: Mon, 1 Apr 2024 20:09:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../product/controller/TypeController.java    | 10 ++++-
 .../com/muyu/product/mapper/TypeMapper.java   |  2 +
 .../com/muyu/product/service/TypeService.java |  2 +
 .../product/service/impl/TypeServiceImpl.java |  5 +++
 .../mapper/product/ArgumentMapper.xml         | 18 ++++++--
 .../resources/mapper/product/TypeMapper.xml   | 41 +++++++++++++++++++
 6 files changed, 74 insertions(+), 4 deletions(-)

diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/TypeController.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/TypeController.java
index fb1a583..6ed1b66 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/TypeController.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/controller/TypeController.java
@@ -6,6 +6,7 @@ import com.muyu.product.domain.Resp.ProductTypeResp;
 import com.muyu.product.service.TypeService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -24,12 +25,19 @@ public class TypeController {
 
 
     @GetMapping("/queryType")
-    public AjaxResult queryType(){
+    public AjaxResult queryTypeAll(){
         List<ProductTypeResp>list=typeService.queryTypeAll();
         return AjaxResult.success(list);
     }
 
 
+    @GetMapping("/queryTypeAttr/{flag}/{id}")
+    public AjaxResult queryType(@PathVariable Integer flag,@PathVariable Integer id){
+        List<ProductTypeAttr>list=typeService.queryType(flag,id);
+        return AjaxResult.success(list);
+    }
+
+
 
 
 }
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/TypeMapper.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/TypeMapper.java
index 2c897fc..6422f19 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/TypeMapper.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/mapper/TypeMapper.java
@@ -16,4 +16,6 @@ public interface TypeMapper {
 
     List<ProductTypeResp> queryTypeAll();
 
+    List<ProductTypeAttr> queryType();
+
 }
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/TypeService.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/TypeService.java
index 387cbe5..b31d4cf 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/TypeService.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/TypeService.java
@@ -13,4 +13,6 @@ public interface TypeService {
 
 
     List<ProductTypeResp> queryTypeAll();
+
+    List<ProductTypeAttr> queryType(Integer flag, Integer id);
 }
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/TypeServiceImpl.java b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/TypeServiceImpl.java
index e3ecf10..4828349 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/TypeServiceImpl.java
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/java/com/muyu/product/service/impl/TypeServiceImpl.java
@@ -24,4 +24,9 @@ public class TypeServiceImpl implements TypeService {
     public List<ProductTypeResp> queryTypeAll() {
         return typeMapper.queryTypeAll();
     }
+
+    @Override
+    public List<ProductTypeAttr> queryType(Integer flag, Integer id) {
+        return typeMapper.queryType();
+    }
 }
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ArgumentMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ArgumentMapper.xml
index 84c0d70..490e12d 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ArgumentMapper.xml
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/ArgumentMapper.xml
@@ -5,16 +5,28 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 <mapper namespace="com.muyu.product.mapper.ArgumentMapper">
 
 
+    <sql id="sql">id,
+    brand_name,first_letter,sort,factory_status,show_status,product_count,product_comment_count,logo,big_pic,brand_story
+    </sql>
+
     <select id="queryBrand" resultType="com.muyu.product.domain.DTO.Brand">
-        select id,brand_name from t_product_brand
+        select <include refid="sql"></include>
+        from t_product_brand
+        <where>
+            id_delete= 1
+            <if test="brandName != null and brandName != 'null' and brandName != ''">
+                and brand_Name like concat('%',#{brandName},'%')
+            </if>
+        </where>
     </select>
 
     <select id="queryService" resultType="com.muyu.product.domain.DTO.Services">
-        select id,service_name from t_product_service
+        select id,service_name from
+            t_product_service
     </select>
 
     <select id="queryCategory" resultType="com.muyu.product.domain.DTO.Category">
-        select id,category_name,parent_id  from t_product_category
+        select id,parent_id,category_name  from t_product_category
     </select>
 
 
diff --git a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/TypeMapper.xml b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/TypeMapper.xml
index 0b2e501..1439802 100644
--- a/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/TypeMapper.xml
+++ b/muyu-modules/muyu-product/muyu-product-server/src/main/resources/mapper/product/TypeMapper.xml
@@ -21,5 +21,46 @@
             t.id, type_name;
     </select>
 
+    <select id="queryType" resultType="com.muyu.product.domain.DTO.ProductTypeAttr">
+        SELECT
+            type_name,
+            ta.product_type_id,
+            attr_name,
+            MAX(ta.multiple_choice) AS multiple_choice,
+            ta.input_method,
+            sort,
+            flag,
+            screen,
+            search,
+            association,
+            stats,
+            input,
+            selection,
+            manual_operation,
+            tav.type_attr_id,
+            CAST(GROUP_CONCAT(tav.type_attr_value) AS CHAR) AS typeAttrValue
+        FROM
+            t_product_type t
+            INNER JOIN t_product_type_attr ta ON t.id = ta.product_type_id
+            INNER JOIN t_product_type_attr_value tav ON tav.type_attr_id = ta.id
+        WHERE
+            ta.flag = ? AND t.id = ?
+        GROUP BY
+            type_name,
+            ta.product_type_id,
+            attr_name,
+            ta.input_method,
+            sort,
+            flag,
+            screen,
+            search,
+            association,
+            stats,
+            input,
+            selection,
+            manual_operation,
+            tav.type_attr_id;
+    </select>
+
 
 </mapper>