From b86634ea023a15d8ca1c44eaa36fb46f4c7fb0b7 Mon Sep 17 00:00:00 2001
From: zxc <1272811460@qq.com>
Date: Thu, 29 Apr 2021 16:40:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=84=E5=8E=86=E5=8F=B2=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=B7=BB=E5=8A=A0=E6=9C=AA=E8=AF=BB=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dto/topic/result/GetPastTopicListV2ResultDTO.java  |  5 +++++
 .../group/dto/topic/result/LatestTenResultDTO.java     |  2 +-
 .../topic/service/impl/ResiTopicServiceImpl.java       | 10 ++++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

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<ResiTopicDao, ResiTopi
         List<UserInfoResultDTO> userInfos = this.disPoseUserInfo(resiGroup.getGroupType(), userIds);
         // 根据用户ID和【活动、通知ID】查询阅读状态
         List<ReadStatusResultDTO> readStatus = resiGroupDao.selectReadFlagByUserAndId(ids, userIds);
+        // 查询小组下的 通知或活动 未读人数
+        List<UserUnReadResultDTO> userUnReadCount = resiGroupDao.selectUserUnReadById(formDTO.getGroupId(), ids);
         // 查询用户徽章信息
         Result<List<UserBadgesResultDTO>> badgeResult = epmetUserOpenFeignClient.userBadges(new UserBadgesFormDTO(formDTO.getCustomerId(),userIds));
         if (!badgeResult.success()){
@@ -2479,6 +2481,14 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
                     }
                 });
             }
+            //
+            if (!CollectionUtils.isEmpty(userUnReadCount)){
+                userUnReadCount.forEach(u -> {
+                    if (i.getId().equals(u.getId())){
+                        i.setUnReadCount(u.getUnRead());
+                    }
+                });
+            }
         });
         return infos;
     }