From 4b0a44566458510d29fad4e912b15d12e00c79fe Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Fri, 30 Apr 2021 17:05:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=B4=BB=E5=8A=A8=E6=9C=AA?=
 =?UTF-8?q?=E8=AF=BB=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=B4=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E8=BF=94=E5=8F=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi/group/dto/notice/result/UnReadListResultDTO.java | 5 +++++
 .../src/main/resources/mapper/group/ResiGroupDao.xml      | 8 +++++---
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/UnReadListResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/UnReadListResultDTO.java
index b92a1879d1..607436692e 100644
--- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/UnReadListResultDTO.java
+++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/notice/result/UnReadListResultDTO.java
@@ -50,6 +50,11 @@ public class UnReadListResultDTO implements Serializable {
      */
     private String contentType;
 
+    /**
+     * 活动状态：已发布：published;已取消：canceled；已变更：changed；已关闭：closed
+     */
+    private String status;
+
     /**
      * 通知是否过期(true：是，false：否)
      */
diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
index 9f45b6997f..e9c1cb3fe1 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
+++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml
@@ -729,7 +729,7 @@
 
     <!-- 查询未读的通知和活动信息 -->
     <select id="selectUnReadInfos" resultType="com.epmet.resi.group.dto.notice.result.UnReadListResultDTO">
-        SELECT id,userId,releaseTime,content,contentType,firstPhoto,isExpirat,isChanged FROM
+        SELECT id,userId,releaseTime,content,contentType,firstPhoto,isExpirat,isChanged,status FROM
             (
                 (SELECT
                      ai.ID,
@@ -739,7 +739,8 @@
                      'act' AS contentType,
                      IFNULL(ac2.CONTENT,'') AS firstPhoto,
                      false AS isExpirat,
-                     false AS isChanged
+                     false AS isChanged,
+                     ai.`STATUS` AS status
                  FROM group_act_info ai
                  LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.DEL_FLAG = 0 AND ac2.SORT = 1
                  WHERE ai.DEL_FLAG = '0'
@@ -758,7 +759,8 @@
                      'notice' AS contentType,
                      IFNULL(na.ATTACHMENT_URL,'') AS firstPhoto,
                      (CASE WHEN UNIX_TIMESTAMP(n.EXPIRATION_TIME) <![CDATA[ < ]]> UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat,
-                     (case when n.is_change = 'yes' then true else false end) AS isChanged
+                     (case when n.is_change = 'yes' then true else false end) AS isChanged,
+                     '' AS status
                  FROM notice n
                  LEFT JOIN notice_attachment na ON na.NOTICE_ID = n.ID AND na.DEL_FLAG = '0' AND na.ATTACHMENT_TYPE = 'image' AND na.SORT = 0
                  WHERE n.DEL_FLAG = '0'