Merge remote-tracking branch 'origin/房屋tree_yzm'

epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/form/CommonArticleListFormDTO.java

@@ -39,5 +39,9 @@ public class CommonArticleListFormDTO implements Serializable {
      * 排除的标签名称(高级配置里的参数)
      * */
     private String excludeTagName;
+    /**
+     * 是否置顶 1是；0否；
+     */
+    private Integer isTop;
 
 }

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

@@ -114,7 +114,11 @@ public interface ArticleDao extends BaseDao<ArticleEntity> {
 	 * @author wangc
 	 * @date 2020.06.02 16:04
 	 **/
-    List<ArticleLatestResultDTO> selectLatestArticleMsg(@Param("gridId") String gridId, @Param("tagName") String tagName, @Param("excludeTagName") String excludeTagName, @Param("num") Integer num);
+    List<ArticleLatestResultDTO> selectLatestArticleMsg(@Param("gridId") String gridId,
+														@Param("tagName") String tagName,
+														@Param("excludeTagName") String excludeTagName,
+														@Param("num") Integer num,
+														@Param("isTop")Integer isTop);
 
     /**
 	 * @param gridId

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

@@ -704,9 +704,12 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	 **/
 	@Override
 	public List<ArticleLatestResultDTO> getLatestArticleList(CommonArticleListFormDTO commonArticleListFormDTO) {
-		return baseDao.selectLatestArticleMsg(commonArticleListFormDTO.getGridId(),commonArticleListFormDTO.getTagName(),commonArticleListFormDTO.getExcludeTagName(),
+		return baseDao.selectLatestArticleMsg(commonArticleListFormDTO.getGridId(),
+				commonArticleListFormDTO.getTagName(),
+				commonArticleListFormDTO.getExcludeTagName(),
 				null == commonArticleListFormDTO.getNum() || commonArticleListFormDTO.getNum() <= NumConstant.ZERO ?
-						NumConstant.FIVE : commonArticleListFormDTO.getNum());
+						NumConstant.FIVE : commonArticleListFormDTO.getNum(),
+				commonArticleListFormDTO.getIsTop());
 	}
 
 	/**

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

@@ -187,7 +187,7 @@
     </select>
 
     <!-- 根据网格Id查找最新文章的相关信息列表 用处:居民端首页最新文章列表 参数:网格Id、客户定制化显示条数 -->
-    <select id="selectLatestArticleMsg" resultType="com.epmet.dto.result.ArticleLatestResultDTO">
+    <select id="selectLatestArticleMsg" parameterType="map" resultType="com.epmet.dto.result.ArticleLatestResultDTO">
         SELECT
         art.ID AS articleId,
         art.TITLE AS articleTitle ,
@@ -224,7 +224,9 @@
         art.DEL_FLAG = '0'
         AND
         art.STATUS_FLAG = 'published'
-
+        <if test="isTop != null">
+            AND art.IS_TOP=#{isTop}
+        </if>
         GROUP BY art.ID
         HAVING 1 = 1
         <if test="tagName != null and tagName != ''">