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