促销任务、计划分页条件查询时，日期范围时间点确认为开始日期的0点到结果日期的24点前

src/main/java/com/wangxiaolu/promotion/domain/activity/dao/impl/TemporaryActivityReportedDaoImpl.java

@@ -123,7 +123,7 @@ public class TemporaryActivityReportedDaoImpl implements TemporaryActivityReport
         if (!StringUtils.isEmpty(tw.getCity())) {
             queryWrapper.eq(TemporaryActivityReportedDO::getCity, tw.getCity());
         }
-        if (Objects.nonNull(tw.getCreateDateStart()) && Objects.nonNull(tw.getCreateDateEnd())) {
+        if (tw.rangeDate()) {
             queryWrapper.between(TemporaryActivityReportedDO::getCreateTime, tw.getCreateDateStart(), tw.getCreateDateEnd());
         }
         if (!StringUtils.isEmpty(tw.getStoreNameLike())){

src/main/java/com/wangxiaolu/promotion/domain/activity/wrapperQo/TemporaryActivityWrapper.java

 package com.wangxiaolu.promotion.domain.activity.wrapperQo;
 
+import cn.hutool.core.date.DateUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -62,4 +63,14 @@ public class TemporaryActivityWrapper {
     private String notApproveStatus;
 
     private String storeNameLike;
+
+    public Date getCreateDateEnd() {
+        String format = DateUtil.format(this.createDateEnd, "yyyy-MM-dd 23:59:59");
+        this.createDateEnd = DateUtil.parse(format);
+        return this.createDateEnd;
+    }
+
+    public boolean rangeDate(){
+        return this.createDateStart != null && this.createDateEnd != null;
+    }
 }

src/main/java/com/wangxiaolu/promotion/domain/activityplanv2/dao/impl/ActivityPlanInfoDaoImpl.java

@@ -121,16 +121,9 @@ public class ActivityPlanInfoDaoImpl implements ActivityPlanInfoDao {
         }
         activityPlanInfoMapper.updateIsDelete(planIds);
     }
-
-    /**
-     * todo
-     * @param wrapper
-     * @return
-     */
-
     private LambdaQueryWrapper<ActivityPlanInfoDo> buildWrapper(ActivityPlanInfoWrapper wrapper) {
         LambdaQueryWrapper<ActivityPlanInfoDo> qw = new LambdaQueryWrapper<>();
-        if (Objects.nonNull(wrapper.getActivityStartDate()) && Objects.nonNull(wrapper.getActivityEndDate())){
+        if (wrapper.rangeDate()){
             qw.between(ActivityPlanInfoDo::getDate, wrapper.getActivityStartDate(), wrapper.getActivityEndDate());
         }
         if (Objects.nonNull(wrapper.getActivityDate())){

src/main/java/com/wangxiaolu/promotion/domain/manage/wrapperQo/ActivityPlanInfoWrapper.java

@@ -118,4 +118,8 @@ public class ActivityPlanInfoWrapper {
         String format = DateUtil.format(this.activityEndDate, "yyyy-MM-dd 23:59:59");
         return DateUtil.parse(format);
     }
+
+    public boolean rangeDate() {
+        return this.activityStartDate != null && this.activityEndDate != null;
+    }
 }