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());