From 1cd2cf2b9a5802223565682a541347f27f61d4da Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Fri, 12 Jun 2026 13:03:25 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E7=89=A9?= =?UTF-8?q?=E6=96=99=E9=A2=84=E8=AD=A6=E5=88=9B=E5=BB=BA=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E8=8C=83=E5=9B=B4=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在WmsMaterialWarningBo中新增createStartTime和createEndTime字段 - 为新增字段添加JSON格式化注解和文档注释 - 在WmsMaterialWarningServiceImpl中实现时间范围查询逻辑 - 使用ge和le条件进行创建时间范围过滤 - 保持按创建时间倒序排列的排序规则 --- .../java/com/klp/domain/bo/WmsMaterialWarningBo.java | 12 ++++++++++++ .../service/impl/WmsMaterialWarningServiceImpl.java | 2 ++ 2 files changed, 14 insertions(+) diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialWarningBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialWarningBo.java index de3cbd07..6f8b92f0 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialWarningBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsMaterialWarningBo.java @@ -105,5 +105,17 @@ public class WmsMaterialWarningBo extends BaseEntity { */ private String remark; + /** + * 创建开始时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createStartTime; + + /** + * 创建结束时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createEndTime; + } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java index 8d99183e..77b60f97 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsMaterialWarningServiceImpl.java @@ -106,6 +106,8 @@ public class WmsMaterialWarningServiceImpl implements IWmsMaterialWarningService lqw.eq(StringUtils.isNotBlank(bo.getHandleBy()), WmsMaterialWarning::getHandleBy, bo.getHandleBy()); lqw.eq(bo.getHandleTime() != null, WmsMaterialWarning::getHandleTime, bo.getHandleTime()); lqw.eq(StringUtils.isNotBlank(bo.getHandleRemark()), WmsMaterialWarning::getHandleRemark, bo.getHandleRemark()); + lqw.ge(bo.getCreateStartTime() != null, WmsMaterialWarning::getCreateTime, bo.getCreateStartTime()); + lqw.le(bo.getCreateEndTime() != null, WmsMaterialWarning::getCreateTime, bo.getCreateEndTime()); // 根据创建时间倒叙 lqw.orderByDesc(WmsMaterialWarning::getCreateTime); return lqw;