Merge remote-tracking branch 'origin/dev_group_act_notice' into dev_group_act_notice

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java

@@ -82,6 +82,11 @@ public class GetPastTopicListV2ResultDTO implements Serializable {
      */
     private Boolean isExpirat;
 
+    /**
+     * 是否变更，yes，no
+     */
+    private String isChange = "no";
+
     @JsonIgnore
     private String userId;
 }

epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java

@@ -90,6 +90,11 @@ public class LatestTenResultDTO implements Serializable {
      */
     private Boolean isExpirat;
 
+    /**
+     * 是否变更，yes，no
+     */
+    private String isChange;
+
     public LatestTenResultDTO() {
         this.id = "";
         this.userId = "";
@@ -106,5 +111,6 @@ public class LatestTenResultDTO implements Serializable {
         this.readOrUnRead = "";
         this.unReadCount = NumConstant.ZERO;
         this.isExpirat = false;
+        this.isChange = "no";
     }
 }

epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupDao.xml

@@ -552,7 +552,7 @@
 
     <!-- 查询 话题、通知、活动最近10条数据 -->
     <select id="selectLatestTen" resultType="com.epmet.resi.group.dto.topic.result.LatestTenResultDTO">
-        SELECT id,userId,releaseTime,content,status,issueId,contentType,firstPhoto FROM
+        SELECT id,userId,releaseTime,content,status,issueId,contentType,firstPhoto,isChange FROM
             ((SELECT
                   t.ID,
                   t.CREATED_BY AS userId,
@@ -562,7 +562,8 @@
                   IFNULL(t.ISSUE_ID,'') AS issueId,
                   'topic' AS contentType,
                   IFNULL(ta.ATTACHMENT_URL,'') AS firstPhoto,
-                  false AS isExpirat
+                  false AS isExpirat,
+                  'no' AS isChange
              FROM resi_topic t
              LEFT JOIN resi_topic_attachment ta ON ta.TOPIC_ID = t.ID AND ta.ATTACHMENT_TYPE = 'image' AND ta.DEL_FLAG = '0' AND ta.SORT = 0
              WHERE t.DEL_FLAG = '0'
@@ -580,7 +581,8 @@
                  '' AS issueId,
                  'act' AS contentType,
                  IFNULL(ac2.CONTENT,'') AS firstPhoto,
-                 false AS isExpirat
+                 false AS isExpirat,
+                 'no' AS isChange
              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'
@@ -597,7 +599,8 @@
                   '' AS issueId,
                   '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 UNIX_TIMESTAMP(n.EXPIRATION_TIME) <![CDATA[ < ]]> UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat,
+                  n.IS_CHANGE
              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'
@@ -772,7 +775,7 @@
 
     <!-- 根据IDs查询 topic，act，notice信息 -->
     <select id="getPastTopicListV2ByIds" resultType="com.epmet.resi.group.dto.topic.result.GetPastTopicListV2ResultDTO">
-        SELECT id,userId,releaseTime,content,status,issueId,contentType,isExpirat FROM
+        SELECT id,userId,releaseTime,content,status,issueId,contentType,isExpirat,isChange FROM
             ((SELECT
                   t.ID,
                   t.CREATED_BY AS userId,
@@ -781,7 +784,8 @@
                   t.`STATUS` AS status,
                   IFNULL(t.ISSUE_ID,'') AS issueId,
                   'topic' AS contentType,
-                  false AS isExpirat
+                  false AS isExpirat,
+                  'no' AS isChange
              FROM resi_topic t
              WHERE t.DEL_FLAG = '0'
                AND t.`STATUS` != 'hidden'
@@ -800,7 +804,8 @@
                  ai.`STATUS` AS status,
                  '' AS issueId,
                  'act' AS contentType,
-                 false AS isExpirat
+                 false AS isExpirat,
+                 'no' AS isChange
              FROM group_act_info ai
              WHERE ai.DEL_FLAG = '0'
              AND (
@@ -818,7 +823,8 @@
                   '' AS status,
                   '' AS issueId,
                   'notice' AS contentType,
-                  (CASE WHEN UNIX_TIMESTAMP(n.EXPIRATION_TIME) <![CDATA[ < ]]> UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat
+                  (CASE WHEN UNIX_TIMESTAMP(n.EXPIRATION_TIME) <![CDATA[ < ]]> UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat,
+                  n.IS_CHANGE
              FROM notice n
              WHERE n.DEL_FLAG = '0'
              AND (