日期条件

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

@@ -6,6 +6,7 @@ import org.springframework.stereotype.Service;
 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.ChatOwnerTotalDTO;
@@ -28,6 +29,9 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
 
     @Override
     public ServiceResponse<Page<GroupChatPlanDTO>> listPage(GroupChatPlanSearchQDTO qdto, BasePageInfo basePageInfo) {
+        if(null != qdto.getEndDate()) {
+            qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
+        }
         Page<GroupChatPlanBO> page = this.groupChatPlanService.listPage(qdto, basePageInfo);
         Page<GroupChatPlanDTO> resultPage = PageHelperUtils.changePageToCurrentPage(page, GroupChatPlanDTO.class);
         return ServiceResponse.success(resultPage);
@@ -77,6 +81,9 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
     @Override
     public ServiceResponse<Page<GroupChatPlanLogDTO>> listLogPage(Long planId, GroupChatPlanSearchQDTO qdto,
             BasePageInfo basePageInfo) {
+        if(null != qdto.getEndDate()) {
+            qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
+        }
         Page<GroupChatPlanLogDTO> page = this.groupChatPlanService.listLogPage(qdto, basePageInfo);
         return ServiceResponse.success(page);
     }
@@ -84,6 +91,9 @@ public class GroupChatPlanApiServiceImpl implements GroupChatPlanApiService {
     @Override
     public ServiceResponse<Page<GroupChatPlanOwnerLogDTO>> listOwnerLogPage(Long planId, GroupChatPlanSearchQDTO qdto,
             BasePageInfo basePageInfo) {
+        if(null != qdto.getEndDate()) {
+            qdto.setEndDate(DateUtil.getEndTimeOfDay(qdto.getEndDate()));
+        }
         Page<GroupChatPlanOwnerLogDTO> page = this.groupChatPlanOwnerLogService.listPage(planId, qdto, basePageInfo);
         return ServiceResponse.success(page);
     }