From 1433d49531bb96a3933028640f494b8a03899e70 Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 4 Jul 2022 14:16:54 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E8=BF=94?=
 =?UTF-8?q?=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/dto/result/DraftPcListResultDTO.java   | 4 ++++
 .../java/com/epmet/dto/result/PublishedListResultDTO.java | 8 ++++++++
 .../src/main/resources/mapper/ArticleDao.xml              | 2 ++
 .../src/main/resources/mapper/DraftDao.xml                | 1 +
 4 files changed, 15 insertions(+)

diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftPcListResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftPcListResultDTO.java
index 97b776e960..2f14da3dc6 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftPcListResultDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/DraftPcListResultDTO.java
@@ -19,6 +19,10 @@ public class DraftPcListResultDTO implements Serializable {
 	 * 文章草稿ID
 	 */
 	private String draftId;
+	/**
+	 * 组织Id
+	 */
+	private String agencyId;
 	/**
 	 * 文章标题
 	 */
diff --git a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java
index 55317885a1..e73acb6294 100644
--- a/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java
+++ b/epmet-module/gov-voice/gov-voice-client/src/main/java/com/epmet/dto/result/PublishedListResultDTO.java
@@ -21,6 +21,10 @@ public class PublishedListResultDTO implements Serializable {
 	 * 文章ID
 	 */
 	private String articleId;
+	/**
+	 * 组织Id
+	 */
+	private String agencyId;
 	/**
 	 * 文章标题
 	 */
@@ -70,6 +74,10 @@ public class PublishedListResultDTO implements Serializable {
 	 * 上下线状态，上线：published，下线：offline
 	 */
 	private String statusFlag;
+	/**
+	 * 上下线状态，已发布：published，已下线：offline
+	 */
+	private String statusFlagName;
 	/**
 	 * 是不是我发布
 	 */
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml
index 4c471430a3..875773b8c9 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/ArticleDao.xml
@@ -429,6 +429,7 @@
     <select id="selectAllArticle" resultType="com.epmet.dto.result.PublishedListResultDTO">
         SELECT
             a.id AS "articleId",
+            a.org_id AS "agencyId",
             a.title AS "title",
             IFNULL(a.preview_content, "") AS "previewContent",
             a.publish_range_desc AS "publishRangeDesc",
@@ -438,6 +439,7 @@
             a.publish_date AS "publishDate",
             IFNULL(a.tags, "") AS "tags",
             a.status_flag AS "statusFlag",
+            IF (a.status_flag = 'published', '已发布', '已下线') "statusFlagName",
             a.rich_text_flag AS "richTextFlag",
             a.created_by AS "createdBy",
             a.is_top AS "isTop",
diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml
index aa7c50a285..de27f83e83 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/resources/mapper/DraftDao.xml
@@ -181,6 +181,7 @@
     <select id="selectAllDraft" resultType="com.epmet.dto.result.DraftPcListResultDTO">
         SELECT
             a.id AS "draftId",
+            a.org_id AS "agencyId",
             a.title AS "title",
             IFNULL(a.preview_content, "") AS "previewContent",
             a.publish_range_desc AS "publishRangeDesc",