diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java index 842e720615..ef6ed42a4f 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/GetPastTopicListV2ResultDTO.java +++ b/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; } diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java index fd5637ba98..7682cc71a9 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/LatestTenResultDTO.java +++ b/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"; } } 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 67577bc380..1965071df5 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 @@ -552,7 +552,7 @@ - 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) UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat + (CASE WHEN UNIX_TIMESTAMP(n.EXPIRATION_TIME) UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat, + n.IS_CHANGE FROM notice n WHERE n.DEL_FLAG = '0' AND (