From 85d6b20470040d48f0ddf924ec5f8974ba126a1a Mon Sep 17 00:00:00 2001
From: zhangjinli <zhangjinli_808@163.com>
Date: Mon, 4 Jul 2022 16:36:52 +0800
Subject: [PATCH] zh

---
 src/main/java/com/zh/project0512/model/Reference.java | 4 ++++
 src/main/resources/mapper/ReferenceMapper.xml         | 7 +++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zh/project0512/model/Reference.java b/src/main/java/com/zh/project0512/model/Reference.java
index ecbdd95..d010f10 100644
--- a/src/main/java/com/zh/project0512/model/Reference.java
+++ b/src/main/java/com/zh/project0512/model/Reference.java
@@ -47,6 +47,10 @@ public class Reference extends Model {
     @TableField("groupId")
     private Integer groupId;
 
+    @Schema(title = "素材分组名称")
+    @TableField(exist = false)
+    private String groupName;
+
     /**
      * 类型：1视频；2图片
      */
diff --git a/src/main/resources/mapper/ReferenceMapper.xml b/src/main/resources/mapper/ReferenceMapper.xml
index 8ea2fd3..668c6ce 100644
--- a/src/main/resources/mapper/ReferenceMapper.xml
+++ b/src/main/resources/mapper/ReferenceMapper.xml
@@ -15,7 +15,7 @@
         </collection>
     </resultMap>
     <select id="list" resultMap="referenceMap">
-        select t1.*,t2.tagId,t3.title as tagTitle,t4.brandId,t5.name as brandName
+        select t1.*,t2.tagId,t3.title as tagTitle,t4.brandId,t5.name as brandName,t6.name as groupName
         <if test='openid!=null'>
             ,(SELECT count(*)!=0 from userReference as ur,user as u
             WHERE t1.id = ur.referenceId and ur.userId = u.id and u.openid = #{openid} ) as isCollected
@@ -23,6 +23,7 @@
         from reference as t1
         LEFT JOIN referenceTag as t2 on t1.id = t2.referenceId LEFT JOIN tag as t3 on t3.id = t2.tagId
         LEFT JOIN referenceBrand as t4 on t1.id = t4.referenceId LEFT JOIN brand as t5 on t5.id = t4.brandId
+        LEFT JOIN referenceGroup as t6 on t1.groupId = t6.id
         WHERE t1.id and t1.isDeleted = 0
         <if test="tagIdList !=null and tagIdList.size()!=0 ">
             and t1.id in (SELECT referenceId from referenceTag WHERE referenceTag.tagId in
@@ -56,6 +57,7 @@
             <result column="duration" property="duration"/>
             <result column="coverUrl" property="coverUrl"/>
             <result column="groupId" property="groupId"/>
+            <result column="groupName" property="groupName"/>
             <result column="creatAt" property="creatAt"/>
             <result column="updateAt" property="updateAt"/>
             <result column="isCollected" property="isCollected"/>
@@ -71,7 +73,7 @@
     </resultMap>
     <select id="referenceDateList" resultMap="referenceDateMap">
         select date_format(t1.creatAt, '%Y-%m-%d') dat,t1.*,t2.tagId,t3.title as tagTitle,t4.brandId,t5.name as
-        brandName
+        brandName,t6.name as groupName
         <if test='openid!=null'>
             ,(SELECT count(*)!=0 from userReference as ur,user as u
             WHERE t1.id = ur.referenceId and ur.userId = u.id and u.openid = #{openid} ) as isCollected
@@ -79,6 +81,7 @@
         from reference as t1
         LEFT JOIN referenceTag as t2 on t1.id = t2.referenceId LEFT JOIN tag as t3 on t3.id = t2.tagId
         LEFT JOIN referenceBrand as t4 on t1.id = t4.referenceId LEFT JOIN brand as t5 on t5.id = t4.brandId
+        LEFT JOIN referenceGroup as t6 on t1.groupId = t6.id
         WHERE t1.id and t1.isDeleted = 0
         <if test="tagIdList !=null and tagIdList.size()!=0 ">
             and t1.id in (SELECT referenceId from referenceTag WHERE referenceTag.tagId in