From e343e508ce5f2d355ad82c05a319981c66d1324b Mon Sep 17 00:00:00 2001
From: inleft <inleft@qq.com>
Date: Wed, 02 Mar 2022 01:36:27 +0800
Subject: [PATCH] 评论页追加完成

---
 snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/mapper/mapping/BlogArticleMapper.xml |   38 ++++++++++++++++++++++++++++++++------
 1 files changed, 32 insertions(+), 6 deletions(-)

diff --git a/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/mapper/mapping/BlogArticleMapper.xml b/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/mapper/mapping/BlogArticleMapper.xml
index 12f48e0..e71b9ef 100644
--- a/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/mapper/mapping/BlogArticleMapper.xml
+++ b/snowy-main/src/main/java/vip/xiaonuo/modular/blogarticle/mapper/mapping/BlogArticleMapper.xml
@@ -29,20 +29,28 @@
     <sql id="queryListCondition">
         <trim prefix="WHERE" prefixOverrides="AND | OR">
             a.is_enable=1
-            and a.auth_status=1
             and a.editor_status=1
+
+            <choose>
+                <when test="param.typeId != null">
+                    AND a.article_type_id = #{param.typeId}
+                </when>
+                <otherwise>
+                    AND a.article_type_id != 4
+                </otherwise>
+            </choose>
         </trim>
+
     </sql>
 
-    <select id="searchMediaList" resultType="vip.xiaonuo.modular.blogarticle.param.BlogArticleVo">
+    <select id="searchList" resultType="vip.xiaonuo.modular.blogarticle.entity.BlogArticleVo">
         select
         <include refid="Base_Column_List"/>
-        ,CONCAT("/",f1.file_bucket,"/",f1.file_object_name) as articleFileURL
         ,IFNULL("",CONCAT("/",f2.file_bucket,"/",f2.file_object_name)) as coverFileURL
         ,t.type_name as articleTypeName
         from
         blog_article a
-        inner join blog_article_type  t
+        inner join blog_article_type t
         on t.id =a.article_type_id
 
         left join sys_file_info f1
@@ -54,12 +62,12 @@
 
         <include refid="queryListCondition"/>
 
-        order by a.top_value asc , a.create_date desc
+        order by a.is_top desc,a.top_value asc , a.create_date desc
 
         limit #{param.pageNo},#{param.pageSize}
     </select>
 
-    <select id="searchMediaListCount" resultType="java.lang.Long">
+    <select id="searchListCount" resultType="java.lang.Long">
         select
         count(0)
         from
@@ -68,4 +76,22 @@
 
     </select>
 
+    <select id="searchMonthCount" resultType="vip.xiaonuo.modular.blogStatistics.vo.BlogArchiveDetailVo">
+       SELECT
+	    separate_month AS `month`,
+	    count(1) AS count
+        FROM
+        	blog_article
+        WHERE
+        	(
+        		is_enable = 1
+        		AND editor_status = 1
+        		AND separate_year = #{separateYear}
+        	)
+        GROUP BY
+        	separate_month
+        ORDER BY  separate_month desc
+
+    </select>
+
 </mapper>

--
Gitblit v1.9.1