From f496348f4db9a64f741cd0947b3d02267887d3e9 Mon Sep 17 00:00:00 2001
From: cuibaocheng <java_cuibaocheng@163.com>
Date: Tue, 23 Jun 2020 19:11:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=95=E8=A7=88=E7=B3=BB=E7=BB=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../articlecontent/IArticleContentDao.java    | 10 +++
 .../IArticleContentService.java               | 10 +++
 .../impl/ArticleContentServiceImpl.java       |  5 ++
 .../articlecontent/articlecontent-mapper.xml  | 66 ++++++++++++++++++-
 4 files changed, 90 insertions(+), 1 deletion(-)

diff --git a/cloud-common-article/src/main/java/com/cm/common/article/dao/articlecontent/IArticleContentDao.java b/cloud-common-article/src/main/java/com/cm/common/article/dao/articlecontent/IArticleContentDao.java
index dad894e..a86d561 100644
--- a/cloud-common-article/src/main/java/com/cm/common/article/dao/articlecontent/IArticleContentDao.java
+++ b/cloud-common-article/src/main/java/com/cm/common/article/dao/articlecontent/IArticleContentDao.java
@@ -70,4 +70,14 @@ public interface IArticleContentDao {
      * @throws SearchException
      */
     Integer countArticleCount(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 文章内容列表
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    List<ArticleContentDTO> listArticleContentAll(Map<String, Object> params) throws SearchException;
+
 }
diff --git a/cloud-common-article/src/main/java/com/cm/common/article/service/articlecontent/IArticleContentService.java b/cloud-common-article/src/main/java/com/cm/common/article/service/articlecontent/IArticleContentService.java
index 0dac3e2..74c6018 100644
--- a/cloud-common-article/src/main/java/com/cm/common/article/service/articlecontent/IArticleContentService.java
+++ b/cloud-common-article/src/main/java/com/cm/common/article/service/articlecontent/IArticleContentService.java
@@ -126,4 +126,14 @@ public interface IArticleContentService {
      * @throws SearchException
      */
     SuccessResultData<Integer> countArticleCount(Map<String, Object> params) throws SearchException;
+
+    /**
+     * 文章内容列表
+     *
+     * @param params
+     * @return
+     * @throws SearchException
+     */
+    List<ArticleContentDTO> listArticleContentAll(Map<String, Object> params) throws SearchException;
+
 }
diff --git a/cloud-common-article/src/main/java/com/cm/common/article/service/articlecontent/impl/ArticleContentServiceImpl.java b/cloud-common-article/src/main/java/com/cm/common/article/service/articlecontent/impl/ArticleContentServiceImpl.java
index e2170ee..efb39e2 100644
--- a/cloud-common-article/src/main/java/com/cm/common/article/service/articlecontent/impl/ArticleContentServiceImpl.java
+++ b/cloud-common-article/src/main/java/com/cm/common/article/service/articlecontent/impl/ArticleContentServiceImpl.java
@@ -160,4 +160,9 @@ public class ArticleContentServiceImpl extends AbstractService implements IArtic
         Integer countArticleCount = articleContentDao.countArticleCount(params);
         return new SuccessResultData<>(countArticleCount == null ? 0 : countArticleCount);
     }
+
+    @Override
+    public List<ArticleContentDTO> listArticleContentAll(Map<String, Object> params) throws SearchException {
+        return articleContentDao.listArticleContentAll(params);
+    }
 }
diff --git a/cloud-common-article/src/main/resources/mybatis/mapper/articlecontent/articlecontent-mapper.xml b/cloud-common-article/src/main/resources/mybatis/mapper/articlecontent/articlecontent-mapper.xml
index becab4c..56ba3ac 100644
--- a/cloud-common-article/src/main/resources/mybatis/mapper/articlecontent/articlecontent-mapper.xml
+++ b/cloud-common-article/src/main/resources/mybatis/mapper/articlecontent/articlecontent-mapper.xml
@@ -19,6 +19,69 @@
         <result column="summary_join_by_article_category_id" property="summaryJoinByArticleCategoryId"/>
     </resultMap>
 
+    <!-- 文章内容列表 -->
+    <select id="listArticleContentAll" parameterType="map" resultMap="articleContentDTO">
+        SELECT
+            t1.title,
+            t1.sub_title,
+            t1.summary,
+            t1.source,
+            t1.author,
+            t1.publish_date,
+            t1.is_publish,
+            t1.content,
+            t1.article_category_id,
+            jt1.title title_join_by_article_category_id,
+            jt1.summary summary_join_by_article_category_id,
+            t1.sort,
+            t1.article_content_id
+        FROM
+            article_content t1
+        INNER JOIN
+            article_category jt1
+        ON
+            t1.article_category_id = jt1.article_category_id
+            AND
+            jt1.is_delete = 0
+        WHERE
+        t1.is_delete = 0
+        <if test="keywords != null and keywords != ''">
+            AND
+            t1.title LIKE CONCAT('%s', #{keywords}, '%')
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ >= ]]> #{startTime}
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND
+            LEFT(t1.gmt_create, 10) <![CDATA[ <= ]]> #{endTime}
+        </if>
+        <if test="articleCategoryId != null and articleCategoryId != ''">
+            AND
+            t1.article_category_id = #{articleCategoryId}
+        </if>
+        <if test="articleContentIds != null and articleContentIds.size > 0">
+            AND
+            t1.article_content_id IN
+            <foreach collection="articleContentIds" index="index" open="(" separator="," close=")">
+                #{articleContentIds[${index}]}
+            </foreach>
+        </if>
+        <if test="creator != null and creator != ''">
+            AND
+            t1.creator = #{creator}
+        </if>
+        <if test="creators != null and creators.size > 0">
+            AND
+            t1.creator IN
+            <foreach collection="creators" index="index" open="(" separator="," close=")">
+                #{creators[${index}]}
+            </foreach>
+        </if>
+        ORDER BY t1.publish_date DESC
+    </select>
+
     <!-- 新增文章内容 -->
     <insert id="saveArticleContent" parameterType="map">
         INSERT INTO article_content(
@@ -168,7 +231,7 @@
             t1.is_delete = 0
         <if test="keywords != null and keywords != ''">
         AND
-            t1.title LIKE CONCAT('%s', #{keywords}, '%')
+            t1.title LIKE CONCAT('%', #{keywords}, '%')
         </if>
         <if test="startTime != null and startTime != ''">
         AND
@@ -200,6 +263,7 @@
                 #{creators[${index}]}
             </foreach>
         </if>
+        ORDER BY t1.publish_date DESC
     </select>
 
     <!-- 统计文章数量 -->