Merge remote-tracking branch 'origin/dev_voice' into dev_voice

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java

@@ -1,9 +1,11 @@
 package com.epmet.dto.result;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.io.Serializable;
+import java.util.List;
 
 /**
  * @author zhaoqifeng
@@ -34,7 +36,12 @@ public class PublishedListResultDTO implements Serializable {
 	/**
 	 * 文章标签串
 	 */
+	@JsonIgnore
 	private String tags;
+	/**
+	 * 文章标签列表
+	 */
+	private List<String> tagNameList;
 	/**
 	 * 概要内容
 	 */

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/dao/ArticleDao.java

@@ -68,21 +68,24 @@ public interface ArticleDao extends BaseDao<ArticleEntity> {
 	 * @author zhaoqifeng
 	 * @date 2020/6/2 16:59
 	 * @param customerId
+	 * @param tagIdList
 	 * @return java.util.List<com.epmet.dto.result.PublishedListResultDTO>
 	 */
-	@DataFilter(tableAliases = "a")
-	List<PublishedListResultDTO> selectArticleListForAgency(@Param("customerId") String customerId);
+	//@DataFilter(tableAliases = "a")
+	List<PublishedListResultDTO> selectArticleListForAgency(@Param("customerId") String customerId, @Param("tagIdList") List<String> tagIdList);
 
 	/**
 	 * 已发布列表---网格工作人员
 	 * @author zhaoqifeng
-	 * @date 2020/6/2 16:59
+	 * @date 2020/6/5 16:35
 	 * @param customerId
+	 * @param tagIdList
 	 * @param gridList
 	 * @return java.util.List<com.epmet.dto.result.PublishedListResultDTO>
 	 */
 	@DataFilter(tableAliases = {"a", "apr"}, gridIdArgName = "gridList")
-	List<PublishedListResultDTO> selectArticleListForGrid(@Param("customerId") String customerId, Set<String> gridList);
+	List<PublishedListResultDTO> selectArticleListForGrid(@Param("customerId") String customerId,
+														  @Param("tagIdList") List<String> tagIdList, Set<String> gridList);
 
 	/**
 	 * 已下线文章列表

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/ArticleServiceImpl.java

@@ -601,10 +601,16 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 			}
 		}
 		if (AGENCY.equals(staffLevel)) {
-			resultList = baseDao.selectArticleListForAgency(tokenDto.getCustomerId());
+			resultList = baseDao.selectArticleListForAgency(tokenDto.getCustomerId(), formDTO.getTagIdList());
 		} else {
-			resultList = baseDao.selectArticleListForGrid(tokenDto.getCustomerId(), userInfo.getGridIdList());
+			resultList = baseDao.selectArticleListForGrid(tokenDto.getCustomerId(), formDTO.getTagIdList(), userInfo.getGridIdList());
 		}
+		resultList.forEach(result -> {
+			String tags = result.getTags();
+			List<String> tagList = new ArrayList<>();
+			tagList= Arrays.asList(tags.split("[|]"));
+			result.setTagNameList(tagList);
+		});
 		PageInfo<PublishedListResultDTO> pageInfo = new PageInfo<>(resultList);
 		return new PageData<>(resultList, pageInfo.getTotal());
 	}

epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml

@@ -58,6 +58,20 @@
         WHERE a.DEL_FLAG = '0'
           AND a.STATUS_FLAG = 'published'
           AND a.CUSTOMER_ID = #{customerId}
+          <if test="tagIdList !=null and tagIdList.size() > 0">
+              AND EXISTS (
+              SELECT DISTINCT
+              at.ARTICLE_ID
+              FROM article_tags at
+              WHERE at.DEL_FLAG = '0'
+              AND at.ARTICLE_ID = a.ID
+              <foreach item="tagId" collection="tagIdList" open="AND (" separator="or" close=")" index="">
+                  at.TAG_ID = #{tagId}
+              </foreach>
+              )
+          </if>
+
+
         ORDER BY PUBLISH_DATE DESC, UPDATED_TIME DESC
     </select>
     <select id="selectArticleListForGrid" resultType="com.epmet.dto.result.PublishedListResultDTO">
@@ -95,6 +109,18 @@
         WHERE aa.DEL_FLAG = '0'
           AND aa.STATUS_FLAG = 'published'
           AND aa.CUSTOMER_ID = #{customerId}) t
+        <if test="tagIdList !=null and tagIdList.size() > 0">
+            AND EXISTS (
+            SELECT DISTINCT
+            at.ARTICLE_ID
+            FROM article_tags at
+            WHERE at.DEL_FLAG = '0'
+            AND at.ARTICLE_ID = t.articleId
+            <foreach item="tagId" collection="tagIdList" open="AND (" separator="or" close=")" index="">
+                at.TAG_ID = #{tagId}
+            </foreach>
+            )
+        </if>
         ORDER BY publishDate DESC, UPDATED_TIME DESC
     </select>