From 3bc6566f2d11a841523e186a21a125e823c3a699 Mon Sep 17 00:00:00 2001
From: wanghao <w0401@foxmail.com>
Date: Sat, 13 Dec 2025 17:32:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E6=9C=8D=E5=8A=A1=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../renkang/emergency/entity/dto/PhoneListDTO.java | 14 ++++++++++++++
 .../emergency/entity/dto/StatisticsDTO.java        |  3 +++
 .../service/impl/TblUserHelpServiceImpl.java       |  7 +++++++
 3 files changed, 24 insertions(+)

diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/PhoneListDTO.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/PhoneListDTO.java
index 748b324..bf59725 100644
--- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/PhoneListDTO.java
+++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/PhoneListDTO.java
@@ -1,7 +1,11 @@
 package com.renkang.emergency.entity.dto;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 @Data
 public class PhoneListDTO {
@@ -35,4 +39,14 @@ public class PhoneListDTO {
      */
     @Schema(description = "pageSize")
     private Integer pageSize=10;
+
+    @Schema(description = "startDate")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date startDate;
+
+    @Schema(description = "endDate")
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    private Date endDate;
 }
diff --git a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/StatisticsDTO.java b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/StatisticsDTO.java
index 9e5a79d..b8f12b7 100644
--- a/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/StatisticsDTO.java
+++ b/health-emergency/health-emergency-api/src/main/java/com/renkang/emergency/entity/dto/StatisticsDTO.java
@@ -2,6 +2,9 @@ package com.renkang.emergency.entity.dto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
 
 @Data
 public class StatisticsDTO {
diff --git a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java
index 8699948..28a46bd 100644
--- a/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java
+++ b/health-emergency/health-emergency-biz/src/main/java/com/renkang/emergency/service/impl/TblUserHelpServiceImpl.java
@@ -1,6 +1,8 @@
 package com.renkang.emergency.service.impl;
 
+import cn.hutool.core.date.DateField;
 import cn.hutool.core.date.DateUtil;
+import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSONArray;
@@ -329,6 +331,11 @@ public class TblUserHelpServiceImpl extends ServiceImpl<TblUserHelpMapper, TblUs
         if (StrUtil.isNotBlank(dto.getSex()) && !"0".equals(dto.getSex())) {
             queryWrapper.eq(TblUserHelp::getSex, dto.getSex());
         }
+        if (ObjUtil.isNotEmpty(dto.getStartDate()) && ObjUtil.isNotEmpty(dto.getEndDate())) {
+            queryWrapper.between(TblUserHelp::getHelpTime,
+                    DateUtil.beginOfDay(dto.getStartDate()),
+                    DateUtil.endOfDay(dto.getEndDate()).offset(DateField.MILLISECOND, -999));
+        }
         queryWrapper.orderByDesc(TblUserHelp::getHelpTime);
         Page<TblUserHelp> returnPage = this.page(new Page<>(dto.getPageNo(), dto.getPageSize()), queryWrapper);
         Page<TblQimoNoticeVo> pageVo = new Page<>();