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 3885933a78..842e720615 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 @@ -77,6 +77,11 @@ public class GetPastTopicListV2ResultDTO implements Serializable { */ private List badgeList = new ArrayList<>(); + /** + * 通知是否过期(true:是 false:否) + */ + private Boolean isExpirat; + @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 e5346ab703..fd5637ba98 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 @@ -85,6 +85,11 @@ public class LatestTenResultDTO implements Serializable { */ private Integer unReadCount; + /** + * 通知是否过期(true:是 false:否) + */ + private Boolean isExpirat; + public LatestTenResultDTO() { this.id = ""; this.userId = ""; @@ -100,5 +105,6 @@ public class LatestTenResultDTO implements Serializable { this.contentType = ""; this.readOrUnRead = ""; this.unReadCount = NumConstant.ZERO; + this.isExpirat = false; } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.16__group_act.sql b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.16__group_act.sql index a80b4f042b..c1da5b98ef 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.16__group_act.sql +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/db/migration/V0.0.16__group_act.sql @@ -291,6 +291,7 @@ CREATE TABLE `group_act_info` ( `CREATED_TIME` datetime(0) NOT NULL COMMENT '创建时间（活动发布时间）', `UPDATED_BY` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '更新人', `UPDATED_TIME` datetime(0) NOT NULL COMMENT '更新时间', + `SHOULD_READ` int(11) NOT NULL COMMENT '应读人数', PRIMARY KEY (`ID`) USING BTREE ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci COMMENT = '组织活动信息' ROW_FORMAT = Dynamic; 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 9942bee2a6..8a25afc9f0 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 @@ -557,12 +557,13 @@ ((SELECT t.ID, t.CREATED_BY AS userId, - DATE_FORMAT(t.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime, + DATE_FORMAT(t.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, t.TOPIC_CONTENT AS content, t.`STATUS` AS status, IFNULL(t.ISSUE_ID,'') AS issueId, 'topic' AS contentType, - IFNULL(ta.ATTACHMENT_URL,'') AS firstPhoto + IFNULL(ta.ATTACHMENT_URL,'') AS firstPhoto, + false AS isExpirat FROM resi_topic t LEFT JOIN resi_topic_attachment ta ON ta.TOPIC_ID = t.ID AND ta.ATTACHMENT_TYPE = 'image' AND ta.SORT = 0 WHERE t.DEL_FLAG = '0' @@ -574,12 +575,13 @@ (SELECT ai.ID, ai.CREATED_BY AS userId, - DATE_FORMAT(ai.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime, + DATE_FORMAT(ai.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, IFNULL(ac.CONTENT,'') AS content, ai.`STATUS` AS status, '' AS issueId, 'act' AS contentType, - IFNULL(ac2.CONTENT,'') AS firstPhoto + IFNULL(ac2.CONTENT,'') AS firstPhoto, + false AS isExpirat FROM group_act_info ai LEFT JOIN group_act_content ac ON ac.GROUP_ACT_ID = ai.ID AND ac.CONTENT_TYPE = 'text' LEFT JOIN group_act_content ac2 ON ac2.GROUP_ACT_ID = ai.ID AND ac2.CONTENT_TYPE = 'img' AND ac2.SORT = 1 @@ -591,12 +593,13 @@ (SELECT n.ID, n.CREATED_BY AS userId, - DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%m:%s') AS releaseTime, + DATE_FORMAT(n.CREATED_TIME,'%Y-%m-%d %H:%i:%s') AS releaseTime, n.CONTENT AS content, '' AS status, '' AS issueId, 'notice' AS contentType, - IFNULL(na.ATTACHMENT_URL,'') AS firstPhoto + IFNULL(na.ATTACHMENT_URL,'') AS firstPhoto, + (CASE WHEN UNIX_TIMESTAMP(n.EXPIRATION_TIME) UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat 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' @@ -793,7 +796,8 @@ t.TOPIC_CONTENT AS content, t.`STATUS` AS status, IFNULL(t.ISSUE_ID,'') AS issueId, - 'topic' AS contentType + 'topic' AS contentType, + false AS isExpirat FROM resi_topic t WHERE t.DEL_FLAG = '0' AND t.`STATUS` != 'hidden' @@ -811,7 +815,8 @@ IFNULL(ac.CONTENT,'') AS content, ai.`STATUS` AS status, '' AS issueId, - 'act' AS contentType + 'act' AS contentType, + false AS isExpirat FROM group_act_info ai LEFT JOIN group_act_content ac ON ac.GROUP_ACT_ID = ai.ID AND ac.CONTENT_TYPE = 'text' WHERE ai.DEL_FLAG = '0' @@ -829,7 +834,8 @@ n.CONTENT AS content, '' AS status, '' AS issueId, - 'notice' AS contentType + 'notice' AS contentType, + (CASE WHEN UNIX_TIMESTAMP(n.EXPIRATION_TIME) UNIX_TIMESTAMP(NOW()) THEN TRUE ELSE FALSE END) AS isExpirat FROM notice n WHERE n.DEL_FLAG = '0' AND (