From cec44c36d36dd0fb7ff0597eff62575bc83e63c1 Mon Sep 17 00:00:00 2001
From: wxy <you@example.com>
Date: Mon, 1 Apr 2024 13:58:43 +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    |  5 ++-
 .../com/muyu/product/mapper/TypeMapper.java   |  5 ++-
 .../com/muyu/product/service/TypeService.java |  3 +-
 .../product/service/impl/TypeServiceImpl.java |  6 ++--
 .../resources/mapper/product/TypeMapper.xml   | 31 ++++++-------------
 5 files changed, 23 insertions(+), 27 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 0e1db50..fb1a583 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
@@ -25,8 +25,11 @@ public class TypeController {
 
     @GetMapping("/queryType")
     public AjaxResult queryType(){
-        List<ProductTypeResp>list=typeService.queryType();
+        List<ProductTypeResp>list=typeService.queryTypeAll();
         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 9f37a60..2c897fc 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
@@ -12,5 +12,8 @@ import java.util.List;
  */
 @Mapper
 public interface TypeMapper {
-    List<ProductTypeResp> queryType();
+
+
+    List<ProductTypeResp> queryTypeAll();
+
 }
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 c5a5937..387cbe5 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
@@ -10,6 +10,7 @@ import java.util.List;
  * @Date: 2024/4/1 11:15
  */
 public interface TypeService {
-    List<ProductTypeResp> queryType();
 
+
+    List<ProductTypeResp> queryTypeAll();
 }
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 dc78c1b..e3ecf10 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
@@ -18,8 +18,10 @@ public class TypeServiceImpl implements TypeService {
 
     @Autowired
     private TypeMapper typeMapper;
+
+
     @Override
-    public List<ProductTypeResp> queryType() {
-        return typeMapper.queryType();
+    public List<ProductTypeResp> queryTypeAll() {
+        return typeMapper.queryTypeAll();
     }
 }
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 f9f0e20..0b2e501 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
@@ -1,37 +1,24 @@
-<?xml version="1.0" encoding="UTF-8" ?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.muyu.product.mapper.TypeMapper">
 
 
-    <select id="queryType" resultType="com.muyu.product.domain.Resp.ProductTypeResp">
+
+    <!-- 添加其他操作方法如插入、更新、删除等 -->
+    <select id="queryTypeAll" resultType="com.muyu.product.domain.Resp.ProductTypeResp">
         SELECT
             t.id,
             type_name,
-            ta.product_type_id,
-            attr_name,
-            multiple_choice,
-            ta.input_method,
-            sort,
-            flag,
-            screen,
-            search,
-            association,
-            stats,
-            input,
-            selection,
-            manual_operation,
-            tav.type_attr_id,
-            GROUP_CONCAT(tav.type_attr_value) as typeAttrValue,
             (SELECT COUNT(id) FROM t_product_type_attr WHERE flag = 0 AND product_type_id = t.id) AS countNum,
             (SELECT COUNT(id) FROM t_product_type_attr WHERE flag = 1 AND product_type_id = t.id) AS countParam
         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
+                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
         GROUP BY
-            ta.attr_name
+            t.id, type_name;
     </select>