diff --git a/src/main/java/com/whdc/model/dto/SmsLogPageDto.java b/src/main/java/com/whdc/model/dto/SmsLogPageDto.java index ebc3492..0307c5d 100644 --- a/src/main/java/com/whdc/model/dto/SmsLogPageDto.java +++ b/src/main/java/com/whdc/model/dto/SmsLogPageDto.java @@ -1,9 +1,12 @@ package com.whdc.model.dto; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.util.Date; + /** * 短信日志分页查询DTO * @@ -19,6 +22,14 @@ public class SmsLogPageDto { @ApiModelProperty(value = "每页条数", example = "10") private Integer pageSize = 10; + @ApiModelProperty(value = "开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date stm; + + @ApiModelProperty(value = "结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private Date etm; + @ApiModelProperty(value = "姓名") private String name; diff --git a/src/main/java/com/whdc/service/impl/SmsLogServiceImpl.java b/src/main/java/com/whdc/service/impl/SmsLogServiceImpl.java index 05308c1..9cffc33 100644 --- a/src/main/java/com/whdc/service/impl/SmsLogServiceImpl.java +++ b/src/main/java/com/whdc/service/impl/SmsLogServiceImpl.java @@ -29,6 +29,12 @@ public class SmsLogServiceImpl extends ServiceImpl impleme if (StringUtils.hasText(dto.getPhone())) { queryWrapper.like(SmsLog::getPhone, dto.getPhone()); } + if (dto.getStm() != null) { + queryWrapper.ge(SmsLog::getSendTm, dto.getStm()); + } + if (dto.getEtm() != null) { + queryWrapper.le(SmsLog::getSendTm, dto.getEtm()); + } // 默认按发送时间降序排列 queryWrapper.orderByDesc(SmsLog::getSendTm);