DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(cost): 添加成本明细和指标结果的日期范围查询功能

Browse Source 
- 在 CostProdDetailBo 中新增 detailDateStart 和 detailDateEnd 字段
- 在 CostProdMetricResultBo 中新增 metricDateStart 和 metricDateEnd 字段
- 在 CostProdDetailServiceImpl 中实现日期范围查询逻辑
- 在 CostProdMetricResultServiceImpl 中实现日期范围查询逻辑
- 为新字段添加日期格式化注解支持
- 实现 between 查询条件用于日期范围过滤
This commit is contained in:
Joshi
2026-06-27 16:36:19 +08:00
parent fabad206c7
commit dbea29eb23
4 changed files with 32 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdDetailBo.java
View File

@@ -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
*/

14
klp-cost/src/main/java/com/klp/cost/domain/bo/CostProdMetricResultBo.java
View File

@@ -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;
/**
* 班组
*/

2
klp-cost/src/main/java/com/klp/cost/service/impl/CostProdDetailServiceImpl.java
View File

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

2
klp-cost/src/main/java/com/klp/cost/service/impl/CostProdMetricResultServiceImpl.java
View File

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