feat(sms): 添加短信日志查询的时间范围筛选功能
- 在 SmsLogPageDto 中新增开始时间和结束时间字段 - 使用 @JsonFormat 注解格式化日期显示 - 在 SmsLogServiceImpl 中实现按时间范围查询逻辑 - 支持根据发送时间进行起止时间筛选 -保持默认按发送时间降序排列的查询规则master
parent
0f94998144
commit
21ac2c2756
|
|
@ -1,9 +1,12 @@
|
||||||
package com.whdc.model.dto;
|
package com.whdc.model.dto;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonFormat;
|
||||||
import io.swagger.annotations.ApiModelProperty;
|
import io.swagger.annotations.ApiModelProperty;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
|
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 短信日志分页查询DTO
|
* 短信日志分页查询DTO
|
||||||
*
|
*
|
||||||
|
|
@ -19,6 +22,14 @@ public class SmsLogPageDto {
|
||||||
@ApiModelProperty(value = "每页条数", example = "10")
|
@ApiModelProperty(value = "每页条数", example = "10")
|
||||||
private Integer pageSize = 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 = "姓名")
|
@ApiModelProperty(value = "姓名")
|
||||||
private String name;
|
private String name;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -29,6 +29,12 @@ public class SmsLogServiceImpl extends ServiceImpl<SmsLogMapper, SmsLog> impleme
|
||||||
if (StringUtils.hasText(dto.getPhone())) {
|
if (StringUtils.hasText(dto.getPhone())) {
|
||||||
queryWrapper.like(SmsLog::getPhone, 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);
|
queryWrapper.orderByDesc(SmsLog::getSendTm);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue