保存草稿内容修改，文章列表排序

epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/constant/DraftConstant.java

@@ -41,4 +41,24 @@ public interface DraftConstant {
      * 不置顶：0
      */
     Integer UN_TOP = 0;
+    /**
+     * 组织
+     */
+    String AGENCY = "agency";
+    /**
+     * 部门
+     */
+    String DEPARTMENT = "department";
+    /**
+     * 网格
+     */
+    String GRID = "grid";
+    /**
+     * 内容类型-图片
+     */
+    String IMG = "img";
+    /**
+     * 内容类型-文字
+     */
+    String TEXT = "text";
 }

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

@@ -91,7 +91,7 @@ public interface ArticleDao extends BaseDao<ArticleEntity> {
 	 * @param gridList
 	 * @return java.util.List<com.epmet.dto.result.OfflineListResultDTO>
 	 */
-	@DataFilter(tableAliases = "a", gridIdArgName = "gridList")
+	@DataFilter(tableAliases = "apr", gridIdArgName = "gridList")
 	List<OfflineListResultDTO> selectOfflineList(Set<String> gridList);
 
 

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

@@ -58,15 +58,25 @@
         WHERE a.DEL_FLAG = '0'
           AND a.STATUS_FLAG = 'published'
           AND a.CUSTOMER_ID = #{customerId}
+        ORDER BY PUBLISH_DATE DESC, UPDATED_TIME DESC
     </select>
     <select id="selectArticleListForGrid" resultType="com.epmet.dto.result.PublishedListResultDTO">
         SELECT
+               articleId,
+               title,
+               previewContent,
+               publisherName,
+               publishDate,
+               tags
+        FROM
+        (SELECT
             a.ID AS "articleId",
             a.TITLE AS "title",
             IFNULL(a.PREVIEW_CONTENT, "") AS "previewContent",
             a.PUBLISHER_NAME AS "publisherName",
             a.PUBLISH_DATE AS "publishDate",
-            IFNULL(a.TAGS, "") AS "tags"
+            IFNULL(a.TAGS, "") AS "tags",
+            a.UPDATED_TIME
         FROM article a
         WHERE a.DEL_FLAG = '0'
           AND a.STATUS_FLAG = 'published'
@@ -78,24 +88,28 @@
             IFNULL(aa.PREVIEW_CONTENT, "") AS "previewContent",
             aa.PUBLISHER_NAME AS "publisherName",
             aa.PUBLISH_DATE AS "publishDate",
-            IFNULL(aa.TAGS, "") AS "tags"
+            IFNULL(aa.TAGS, "") AS "tags",
+            aa.UPDATED_TIME
         FROM article aa
                  INNER JOIN article_publish_range apr ON aa.ID = apr.ARTICLE_ID AND apr.DEL_FLAG = 0 AND apr.PUBLISH_STATUS = 'published'
         WHERE aa.DEL_FLAG = '0'
           AND aa.STATUS_FLAG = 'published'
-          AND aa.CUSTOMER_ID = #{customerId}
+          AND aa.CUSTOMER_ID = #{customerId}) t
+        ORDER BY publishDate DESC, UPDATED_TIME DESC
     </select>
 
     <select id="selectOfflineList" resultType="com.epmet.dto.result.OfflineListResultDTO">
-        SELECT
+        SELECT DISTINCT
             a.ID AS "articleId",
             a.TITLE AS "title",
             IFNULL(a.PREVIEW_CONTENT, "") AS "previewContent",
             a.PUBLISHER_NAME AS "publisherName",
             a.PUBLISH_DATE AS "publishDate"
         FROM article a
+        INNER JOIN article_publish_range apr ON a.ID = apr.ARTICLE_ID AND  apr.DEL_FLAG = '0'
         WHERE a.DEL_FLAG = '0'
-          AND a.STATUS_FLAG = 'offline'
+          AND apr.PUBLISH_STATUS = 'offline'
+        ORDER BY apr.OFF_LINE_TIME DESC
     </select>