From a2ffe5cc73191c0ee09ff6f7ca09d396d2201091 Mon Sep 17 00:00:00 2001
From: Joshi <3040996759@qq.com>
Date: Wed, 21 Jan 2026 16:13:23 +0800
Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E9=A4=90?=
 =?UTF-8?q?=E6=8A=A5=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 实现 startTime 和 endTime 参数的时间范围过滤
- 集成到现有 reportDate 查询条件中
- 保持与其他查询参数的兼容性
---
 .../java/com/klp/service/impl/WmsMealReportServiceImpl.java    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java
index d9ec058b..4cfe6f54 100644
--- a/klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java
+++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMealReportServiceImpl.java
@@ -108,6 +108,9 @@ public class WmsMealReportServiceImpl implements IWmsMealReportService {
             lqw.between(WmsMealReport::getReportDate, Date.from(startDate.atZone(ZoneId.systemDefault()).toInstant()),
                 Date.from(endDate.atZone(ZoneId.systemDefault()).toInstant()));
         }
+        if (bo.getStartTime() != null && bo.getEndTime() != null){
+            lqw.between(WmsMealReport::getReportDate, bo.getStartTime(), bo.getEndTime());
+        }
         lqw.eq(bo.getMealType() != null, WmsMealReport::getMealType, bo.getMealType());
         lqw.like(StringUtils.isNotBlank(bo.getDeptName()), WmsMealReport::getDeptName, bo.getDeptName());
         lqw.eq(bo.getTotalPeople() != null, WmsMealReport::getTotalPeople, bo.getTotalPeople());