From dbea29eb23b5285f4964a0f8df4f86b6e02c9822 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 27 Jun 2026 16:36:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(cost):=20=E6=B7=BB=E5=8A=A0=E6=88=90?= =?UTF-8?q?=E6=9C=AC=E6=98=8E=E7=BB=86=E5=92=8C=E6=8C=87=E6=A0=87=E7=BB=93?= =?UTF-8?q?=E6=9E=9C=E7=9A=84=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 CostProdDetailBo 中新增 detailDateStart 和 detailDateEnd 字段 - 在 CostProdMetricResultBo 中新增 metricDateStart 和 metricDateEnd 字段 - 在 CostProdDetailServiceImpl 中实现日期范围查询逻辑 - 在 CostProdMetricResultServiceImpl 中实现日期范围查询逻辑 - 为新字段添加日期格式化注解支持 - 实现 between 查询条件用于日期范围过滤 --- .../com/klp/cost/domain/bo/CostProdDetailBo.java | 14 ++++++++++++++ .../klp/cost/domain/bo/CostProdMetricResultBo.java | 14 ++++++++++++++ .../service/impl/CostProdDetailServiceImpl.java | 2 ++ .../impl/CostProdMetricResultServiceImpl.java | 2 ++ 4 files changed, 32 insertions(+) diff --git a/klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdDetailBo.java b/klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdDetailBo.java index 9f242972e..b0232fff2 100644 --- a/klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdDetailBo.java +++ b/klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdDetailBo.java @@ -44,6 +44,20 @@ public class CostProdDetailBo extends BaseEntity { @DateTimeFormat(pattern = "yyyy-MM-dd") private Date detailDate; + /** + * 日期起 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date detailDateStart; + + /** + * 日期止 + */ + @JsonFormat(pattern = "yyyy-MM-dd") + @DateTimeFormat(pattern = "yyyy-MM-dd") + private Date detailDateEnd; + /** * 成本项目ID */ diff --git a/klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdMetricResultBo.java b/klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdMetricResultBo.java index 58e8c9162..32f46684b 100644 --- a/klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdMetricResultBo.java +++ b/klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdMetricResultBo.java @@ -44,6 +44,20 @@ public class CostProdMetricResultBo extends BaseEntity { @JsonFormat(pattern = "yyyy-MM-dd") private Date metricDate; + /** + * 计算日期起 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date metricDateStart; + + /** + * 计算日期止 + */ + @DateTimeFormat(pattern = "yyyy-MM-dd") + @JsonFormat(pattern = "yyyy-MM-dd") + private Date metricDateEnd; + /** * 班组 */ diff --git a/klp-cost/src/main/java/com/klp/cost/service/impl/CostProdDetailServiceImpl.java b/klp-cost/src/main/java/com/klp/cost/service/impl/CostProdDetailServiceImpl.java index 8042b7c19..ddc7a0bd4 100644 --- a/klp-cost/src/main/java/com/klp/cost/service/impl/CostProdDetailServiceImpl.java +++ b/klp-cost/src/main/java/com/klp/cost/service/impl/CostProdDetailServiceImpl.java @@ -67,6 +67,8 @@ public class CostProdDetailServiceImpl implements ICostProdDetailService { lqw.eq(bo.getReportId() != null, CostProdDetail::getReportId, bo.getReportId()); lqw.eq(StringUtils.isNotBlank(bo.getShift()), CostProdDetail::getShift, bo.getShift()); lqw.eq(bo.getDetailDate() != null, CostProdDetail::getDetailDate, bo.getDetailDate()); + lqw.between(bo.getDetailDateStart() != null && bo.getDetailDateEnd() != null, + CostProdDetail::getDetailDate, bo.getDetailDateStart(), bo.getDetailDateEnd()); lqw.eq(bo.getItemId() != null, CostProdDetail::getItemId, bo.getItemId()); lqw.eq(bo.getQuantity() != null, CostProdDetail::getQuantity, bo.getQuantity()); lqw.eq(bo.getUnitPrice() != null, CostProdDetail::getUnitPrice, bo.getUnitPrice()); diff --git a/klp-cost/src/main/java/com/klp/cost/service/impl/CostProdMetricResultServiceImpl.java b/klp-cost/src/main/java/com/klp/cost/service/impl/CostProdMetricResultServiceImpl.java index eab4a3c6f..ce33507bf 100644 --- a/klp-cost/src/main/java/com/klp/cost/service/impl/CostProdMetricResultServiceImpl.java +++ b/klp-cost/src/main/java/com/klp/cost/service/impl/CostProdMetricResultServiceImpl.java @@ -67,6 +67,8 @@ public class CostProdMetricResultServiceImpl implements ICostProdMetricResultSer lqw.eq(bo.getReportId() != null, CostProdMetricResult::getReportId, bo.getReportId()); lqw.eq(bo.getMetricId() != null, CostProdMetricResult::getMetricId, bo.getMetricId()); lqw.eq(bo.getMetricDate() != null, CostProdMetricResult::getMetricDate, bo.getMetricDate()); + lqw.between(bo.getMetricDateStart() != null && bo.getMetricDateEnd() != null, + CostProdMetricResult::getMetricDate, bo.getMetricDateStart(), bo.getMetricDateEnd()); lqw.eq(StringUtils.isNotBlank(bo.getTeamGroup()), CostProdMetricResult::getTeamGroup, bo.getTeamGroup()); lqw.eq(bo.getCalcValue() != null, CostProdMetricResult::getCalcValue, bo.getCalcValue()); lqw.eq(StringUtils.isNotBlank(bo.getTags()), CostProdMetricResult::getTags, bo.getTags());