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

feat(inspection): 添加检验模块日期范围筛选功能

Browse Source 
- 在WmsInspectionMainBo中增加inspectionDateStart和inspectionDateEnd字段用于日期范围筛选
- 在WmsInspectionMainServiceImpl中实现日期范围查询逻辑
- 在WmsInspectionTensileDetailBo中增加productionDateStart、productionDateEnd、testDateStart和testDateEnd字段
- 在WmsInspectionTensileDetailServiceImpl中实现生产日期和试验日期范围查询逻辑
- 添加DateTimeFormat注解支持日期格式化处理
This commit is contained in:
Joshi
2026-06-13 13:08:11 +08:00
parent 0d40774194
commit f0de25a3a2
4 changed files with 45 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionMainBo.java
View File

@@ -7,6 +7,7 @@ import javax.validation.constraints.*;
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
import org.springframework.format.annotation.DateTimeFormat;
/**
* 检验主业务对象 wms_inspection_main
@@ -29,6 +30,20 @@ public class WmsInspectionMainBo extends BaseEntity {
*/
private Date inspectionDate;
/**
* 检验日期开始（用于范围筛选）
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inspectionDateStart;
/**
* 检验日期结束（用于范围筛选）
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date inspectionDateEnd;
/**
* 样品名称（对应样品名称列）
*/

24
klp-wms/src/main/java/com/klp/domain/bo/WmsInspectionTensileDetailBo.java
View File

@@ -75,11 +75,35 @@ public class WmsInspectionTensileDetailBo extends BaseEntity {
*/
private Date productionDate;
/**
* 生产日期开始（用于范围筛选）
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date productionDateStart;
/**
* 生产日期结束（用于范围筛选）
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date productionDateEnd;
/**
* 试验日期
*/
private Date testDate;
/**
* 试验日期开始（用于范围筛选）
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date testDateStart;
/**
* 试验日期结束（用于范围筛选）
*/
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date testDateEnd;
/**
* 试样方向（纵/横）
*/

2
klp-wms/src/main/java/com/klp/service/impl/WmsInspectionMainServiceImpl.java
View File

@@ -62,6 +62,8 @@ public class WmsInspectionMainServiceImpl implements IWmsInspectionMainService {
Map<String, Object> params = bo.getParams();
LambdaQueryWrapper<WmsInspectionMain> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getInspectionDate() != null, WmsInspectionMain::getInspectionDate, bo.getInspectionDate());
lqw.ge(bo.getInspectionDateStart() != null, WmsInspectionMain::getInspectionDate, bo.getInspectionDateStart());
lqw.le(bo.getInspectionDateEnd() != null, WmsInspectionMain::getInspectionDate, bo.getInspectionDateEnd());
lqw.like(StringUtils.isNotBlank(bo.getSampleName()), WmsInspectionMain::getSampleName, bo.getSampleName());
lqw.eq(StringUtils.isNotBlank(bo.getSampleNo()), WmsInspectionMain::getSampleNo, bo.getSampleNo());
lqw.eq(StringUtils.isNotBlank(bo.getBatchNo()), WmsInspectionMain::getBatchNo, bo.getBatchNo());

4
klp-wms/src/main/java/com/klp/service/impl/WmsInspectionTensileDetailServiceImpl.java
View File

@@ -71,7 +71,11 @@ public class WmsInspectionTensileDetailServiceImpl implements IWmsInspectionTens
lqw.eq(StringUtils.isNotBlank(bo.getProductionTeam()), WmsInspectionTensileDetail::getProductionTeam, bo.getProductionTeam());
lqw.eq(StringUtils.isNotBlank(bo.getSurfaceStatus()), WmsInspectionTensileDetail::getSurfaceStatus, bo.getSurfaceStatus());
lqw.eq(bo.getProductionDate() != null, WmsInspectionTensileDetail::getProductionDate, bo.getProductionDate());
lqw.ge(bo.getProductionDateStart() != null, WmsInspectionTensileDetail::getProductionDate, bo.getProductionDateStart());
lqw.le(bo.getProductionDateEnd() != null, WmsInspectionTensileDetail::getProductionDate, bo.getProductionDateEnd());
lqw.eq(bo.getTestDate() != null, WmsInspectionTensileDetail::getTestDate, bo.getTestDate());
lqw.ge(bo.getTestDateStart() != null, WmsInspectionTensileDetail::getTestDate, bo.getTestDateStart());
lqw.le(bo.getTestDateEnd() != null, WmsInspectionTensileDetail::getTestDate, bo.getTestDateEnd());
lqw.eq(StringUtils.isNotBlank(bo.getSampleDirection()), WmsInspectionTensileDetail::getSampleDirection, bo.getSampleDirection());
lqw.eq(StringUtils.isNotBlank(bo.getSampleSize()), WmsInspectionTensileDetail::getSampleSize, bo.getSampleSize());
lqw.eq(bo.getOriginalGaugeLength() != null, WmsInspectionTensileDetail::getOriginalGaugeLength, bo.getOriginalGaugeLength());