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

日期

See merge request !738

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

@@ -13,6 +13,7 @@ import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.BasePageInfo;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.DateUtil;
 import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.PageHelperUtils;
 import com.gic.haoban.manage.api.dto.chat.GroupChatHmDTO;
@@ -44,6 +45,9 @@ public class GroupChatHmApiServiceImpl implements GroupChatHmApiService {
 
     @Override
     public ServiceResponse<Page<GroupChatHmDTO>> listPage(ChatHmSearchQDTO qdto, BasePageInfo basePageInfo) {
+        if (null != qdto.getEndDate()) {
+            qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
+        }
         Page<GroupChatHmBO> page = this.groupChatHmService.listPage(qdto, basePageInfo);
         logger.info("PAGE={}", JSON.toJSONString(page));
         if (CollectionUtils.isEmpty(page.getResult())) {