通知列表(通) 增加富文本返回字段、查询条件增加

esua-epdc/epdc-commons/epdc-commons-tools/src/main/java/com/elink/esua/epdc/commons/tools/constant/NumConstant.java

@@ -41,5 +41,6 @@ public interface NumConstant {
     String THREE_STR = "3";
     String FOUR_STR = "4";
     String FIVE_STR = "5";
+    String SIX_STR = "6";
 
 }

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/form/v2/EpdcNoticeListV2FormDTO.java

@@ -36,8 +36,8 @@ public class EpdcNoticeListV2FormDTO implements Serializable {
     private Integer pageSize;
 
     /**
-     * 通知类别:模块编码（0-政策导航，1-印象，2-味道）
+     * 通知类别:模块编码（1-印象，2-味道，5-最新通知，6-最热政策）
      */
-    @NotBlank(message = "通知类别（0-政策导航，1-印象，2-味道）不能为空")
+    @NotBlank(message = "通知类别（1-印象，2-味道，5-最新通知，6-最热政策）不能为空")
     private String noticeCategory;
 }

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/dto/epdc/result/EpdcNoticeListResultDTO.java

@@ -43,4 +43,9 @@ public class EpdcNoticeListResultDTO implements Serializable {
      * 首图
      */
     private String imgUrl;
+
+    /**
+     * 通知内容
+     */
+    private String noticeContent;
 }

esua-epdc/epdc-module/epdc-news/epdc-news-client/src/main/java/com/elink/esua/epdc/enums/AppNoticeCategoryEnum.java

@@ -10,10 +10,6 @@ import com.elink.esua.epdc.commons.tools.constant.NumConstant;
  */
 public enum AppNoticeCategoryEnum {
 
-    /**
-     * 0 政策导航
-     */
-    NOTICE_NAVIGATION("notice_navigation", NumConstant.ZERO_STR),
     /**
      * 1 印象
      */
@@ -29,7 +25,17 @@ public enum AppNoticeCategoryEnum {
     /**
      * 4 档案
      */
-    NOTICE_FILE("notice_file", NumConstant.FOUR_STR);
+    NOTICE_FILE("notice_file", NumConstant.FOUR_STR),
+
+    /**
+     * 5 政策导航-最新通知
+     */
+    NOTICE_NAVIGATION_NEW("notice_navigation_new", NumConstant.FIVE_STR),
+
+    /**
+     * 6 政策导航-最热政策
+     */
+    NOTICE_NAVIGATION_HOT("notice_navigation_hot", NumConstant.SIX_STR);
 
     private String name;
     private String index;

esua-epdc/epdc-module/epdc-news/epdc-news-server/src/main/resources/mapper/NoticeDao.xml

@@ -102,7 +102,8 @@
             en.NOTICE_TITLE AS noticeTitle,
             en.RELEASE_TIME AS noticeTime,
             SUBSTRING_INDEX(en.ALL_DEPT_NAMES,'-',-1) AS deptName,
-            en.NOTICE_IMAGE_URL imgUrl
+            en.NOTICE_IMAGE_URL imgUrl,
+            en.NOTICE_CONTENT noticeContent
         FROM
             epdc_notice en
         RIGHT JOIN epdc_notice_department nd ON en.ID = nd.NOTICE_ID