From 21ac2c2756d7c68ae8363f23e4fd26a1c17b8cf9 Mon Sep 17 00:00:00 2001
From: lyf66 <admin@cloudowr.com>
Date: Sun, 28 Sep 2025 16:02:27 +0800
Subject: [PATCH] =?UTF-8?q?feat(sms):=20=E6=B7=BB=E5=8A=A0=E7=9F=AD?=
 =?UTF-8?q?=E4=BF=A1=E6=97=A5=E5=BF=97=E6=9F=A5=E8=AF=A2=E7=9A=84=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=8C=83=E5=9B=B4=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在 SmsLogPageDto 中新增开始时间和结束时间字段
- 使用 @JsonFormat 注解格式化日期显示
- 在 SmsLogServiceImpl 中实现按时间范围查询逻辑
- 支持根据发送时间进行起止时间筛选
-保持默认按发送时间降序排列的查询规则
---
 src/main/java/com/whdc/model/dto/SmsLogPageDto.java   | 11 +++++++++++
 .../java/com/whdc/service/impl/SmsLogServiceImpl.java |  6 ++++++
 2 files changed, 17 insertions(+)

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<SmsLogMapper, SmsLog> 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);