Merge branch 'feature/社群' into 'developer'

下线时间处理

See merge request !786

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/chat/impl/GroupChatServiceImpl.java

@@ -245,18 +245,18 @@ public class GroupChatServiceImpl implements GroupChatService {
 
     @Override
     public Page<GroupChatDTO> listPage(GroupChatSearchQDTO qdto, BasePageInfo basePageInfo) {
+        List<TabGroupChatHmRelation> relationList = null;
         if (null != qdto.getChatHmId()) {
-            List<TabGroupChatHmRelation> list = null;
             if (qdto.getIncludeOff() == 1) {
-                list = this.groupChatHmRelationMapper.listByChatHmIdIncludeOff(qdto.getChatHmId());
+                relationList = this.groupChatHmRelationMapper.listByChatHmIdIncludeOff(qdto.getChatHmId());
             } else {
-                list = this.groupChatHmRelationMapper.listByChatHmId(qdto.getChatHmId());
+                relationList = this.groupChatHmRelationMapper.listByChatHmId(qdto.getChatHmId());
             }
-            if (CollectionUtils.isEmpty(list)) {
+            if (CollectionUtils.isEmpty(relationList)) {
                 return new Page<GroupChatDTO>();
             }
-            logger.info("活码页查询群列表{},关联群数={}", qdto.getChatHmId(), list.size());
-            List<Long> groupChatIdList = list.stream().map(dto -> dto.getGroupChatId()).collect(Collectors.toList());
+            logger.info("活码页查询群列表{},关联群数={}", qdto.getChatHmId(), relationList.size());
+            List<Long> groupChatIdList = relationList.stream().map(dto -> dto.getGroupChatId()).collect(Collectors.toList());
             qdto.setGroupChatIdList(groupChatIdList);
         }
         qdto.setDepartmentIdList(this.setDepartIdList(qdto.getWxEnterpriseId(), qdto.getDepartmentId()));
@@ -267,6 +267,14 @@ public class GroupChatServiceImpl implements GroupChatService {
             qdto.setSearchParams("%" + params + "%");
         }
         List<GroupChatDTO> list = this.groupChatMapper.list(qdto);
+        if(CollectionUtils.isNotEmpty(list) && CollectionUtils.isNotEmpty(relationList)) {
+            Map<Long,Date> offMap = relationList.stream().filter(dto->dto.getStatusFlag()==2).collect(Collectors.toMap(TabGroupChatHmRelation::getGroupChatId,TabGroupChatHmRelation::getUpdateTime,(k1,k2)->k1));
+            for(GroupChatDTO dto : list) {
+                if(null != offMap.get(dto.getGroupChatId())) {
+                    dto.setOffTime( offMap.get(dto.getGroupChatId()));
+                }
+            }
+        }
         Page<GroupChatDTO> retPage = PageHelperUtils.changePageHelperToCurrentPage(list, GroupChatDTO.class);
         return retPage;
     }