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 60ae030008..982c254def 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 @@ -87,6 +87,11 @@ public class GetPastTopicListV2ResultDTO implements Serializable { */ private Boolean isChanged = false; + /** + * 通知或活动未读人员数 + */ + private Integer unReadCount; + @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 1302bd15f9..129c7a462d 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 @@ -111,6 +111,6 @@ public class LatestTenResultDTO implements Serializable { this.readOrUnRead = ""; this.unReadCount = NumConstant.ZERO; this.isExpirat = false; - this.isChange = "no"; + this.isChanged = false; } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index f5d4db2f50..ed8387e203 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -2438,6 +2438,8 @@ public class ResiTopicServiceImpl extends BaseServiceImpl userInfos = this.disPoseUserInfo(resiGroup.getGroupType(), userIds); // 根据用户ID和【活动、通知ID】查询阅读状态 List readStatus = resiGroupDao.selectReadFlagByUserAndId(ids, userIds); + // 查询小组下的 通知或活动 未读人数 + List userUnReadCount = resiGroupDao.selectUserUnReadById(formDTO.getGroupId(), ids); // 查询用户徽章信息 Result> badgeResult = epmetUserOpenFeignClient.userBadges(new UserBadgesFormDTO(formDTO.getCustomerId(),userIds)); if (!badgeResult.success()){ @@ -2479,6 +2481,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl { + if (i.getId().equals(u.getId())){ + i.setUnReadCount(u.getUnRead()); + } + }); + } }); return infos; }