/gov/voice/article/article-list-ytding

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

@@ -26,12 +26,12 @@ public class CommonArticleListFormDTO implements Serializable {
      * 烟台需求：周边疫情   就业服务   警民互动   物业通知   党务公开  居务公开  财务公开     以上标签在实时动态里写死吧
      *
      */
-    public interface YanTaiShowGroup extends CustomerClientShowGroup {
+    public interface YanTaiDingShowGroup extends CustomerClientShowGroup {
     }
     /**
      * 网格Id
      * */
-    @NotBlank(message = "网格Id不能为空" , groups = {ArticleBannerInternalGroup.class,YanTaiShowGroup.class})
+    @NotBlank(message = "网格Id不能为空" , groups = {ArticleBannerInternalGroup.class,YanTaiDingShowGroup.class})
     private String gridId;
 
     /**
@@ -42,7 +42,7 @@ public class CommonArticleListFormDTO implements Serializable {
     /**
      * 标签名称(高级配置里的参数)
      * */
-    @NotBlank(message = "标签名称不能为空",groups = YanTaiShowGroup.class)
+    @NotBlank(message = "标签名称不能为空",groups = YanTaiDingShowGroup.class)
     private String tagName;
     /**
      * 排除的标签名称(高级配置里的参数)
@@ -53,8 +53,14 @@ public class CommonArticleListFormDTO implements Serializable {
      */
     private Integer isTop;
 
-    @NotNull(message = "pageNo不能为空", groups = YanTaiShowGroup.class)
+    @NotNull(message = "pageNo不能为空", groups = YanTaiDingShowGroup.class)
     private Integer pageNo;
-    @NotNull(message = "pageSize不能为空", groups = YanTaiShowGroup.class)
+    @NotNull(message = "pageSize不能为空", groups = YanTaiDingShowGroup.class)
     private Integer pageSize;
+
+    /**
+     * 标签名称(高级配置里的参数)
+     * */
+    @NotBlank(message = "标签名称不能为空",groups = YanTaiDingShowGroup.class)
+    private String tagId;
 }

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/controller/ArticleController.java

@@ -338,11 +338,11 @@ public class ArticleController {
 	 */
 	@PostMapping("article-list-ytding")
 	public Result<PageData<ArticleLatestResultDTO>> pageArticleListByTagName(@RequestBody CommonArticleListFormDTO formDTO) {
-		ValidatorUtils.validateEntity(formDTO, CommonArticleListFormDTO.YanTaiShowGroup.class);
+		ValidatorUtils.validateEntity(formDTO, CommonArticleListFormDTO.YanTaiDingShowGroup.class);
 		return new Result<PageData<ArticleLatestResultDTO>>().ok(articleService.pageArticleListByTagName(formDTO.getPageNo(),
 				formDTO.getPageSize(),
 				formDTO.getGridId(),
-				formDTO.getTagName()));
+				formDTO.getTagName(),formDTO.getTagId()));
 	}
 
 

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

@@ -178,5 +178,6 @@ public interface ArticleDao extends BaseDao<ArticleEntity> {
 	List<ArticleLatestResultDTO> pageArticleListByTagName(@Param("gridId")String gridId,
 														  @Param("tagName")String tagName,
 														  @Param("customerId")String customerId,
-														  @Param("agencyId")String agencyId);
+														  @Param("agencyId")String agencyId,
+														  @Param("tagId")String tagId);
 }

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

@@ -291,5 +291,6 @@ public interface ArticleService extends BaseService<ArticleEntity> {
 	PageData<ArticleLatestResultDTO> pageArticleListByTagName(Integer pageNo,
 															  Integer pageSize,
 															  String gridId,
-															  String tagName);
+															  String tagName,
+															  String tagId);
 }

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

@@ -2014,13 +2014,13 @@ public class ArticleServiceImpl extends BaseServiceImpl<ArticleDao, ArticleEntit
 	 * @return
 	 */
 	@Override
-	public PageData<ArticleLatestResultDTO> pageArticleListByTagName(Integer pageNo, Integer pageSize, String gridId, String tagName) {
+	public PageData<ArticleLatestResultDTO> pageArticleListByTagName(Integer pageNo, Integer pageSize, String gridId, String tagName,String tagId) {
 		PageHelper.startPage(pageNo, pageSize);
 		List<ArticleLatestResultDTO> list = baseDao.pageArticleListByTagName(
 				gridId,
 				tagName,
 				EpmetRequestHolder.getLoginUserCustomerId(),
-				null);
+				null,tagId);
 		PageInfo<ArticleLatestResultDTO> pageInfo = new PageInfo<>(list);
 		return new PageData<>(list, pageInfo.getTotal());
 	}

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

@@ -534,8 +534,8 @@
         WHERE
             art.DEL_FLAG = '0'
           AND art.CUSTOMER_ID = #{customerId}
-            <if test="tagName != null and tagName != '' ">
-                AND t.TAG_NAME LIKE concat ( '%', #{tagName}, '%' )
+            <if test="tagId != null and tagId != '' ">
+                AND t.TAG_ID = #{tagId}
             </if>
             <if test="gridId != null and gridId != '' ">
                 and apr.GRID_ID=#{gridId}
@@ -543,6 +543,9 @@
             <if test="agencyId != null and agencyId != '' ">
                 AND art.org_id_path like concat('%',#{agencyId},'%')
             </if>
+            <if test="tagName != null and tagName != '' ">
+                AND t.TAG_NAME LIKE concat ( '%', #{tagName}, '%' )
+            </if>
         ORDER BY
             art.PUBLISH_DATE DESC,
             art.CREATED_TIME DESC