diff --git a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPqcTaskRecordSearchQO.java b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPqcTaskRecordSearchQO.java index 83d690ed..2fc3126c 100644 --- a/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPqcTaskRecordSearchQO.java +++ b/nflg-wms-common/src/main/java/com/nflg/wms/common/pojo/qo/QmsPqcTaskRecordSearchQO.java @@ -58,6 +58,16 @@ public class QmsPqcTaskRecordSearchQO { */ private String createTimeEnd; + /** + * 兼容前端传参:开始时间 + */ + private String startTime; + + /** + * 兼容前端传参:结束时间 + */ + private String endTime; + /** * 页码 */ @@ -72,14 +82,20 @@ public class QmsPqcTaskRecordSearchQO { if (createStartTime != null) { return createStartTime; } - return parseDateTime(createTimeStart, false); + if (createTimeStart != null && !createTimeStart.isBlank()) { + return parseDateTime(createTimeStart, false); + } + return parseDateTime(startTime, false); } public LocalDateTime getCreateEndTime() { if (createEndTime != null) { return createEndTime; } - return parseDateTime(createTimeEnd, true); + if (createTimeEnd != null && !createTimeEnd.isBlank()) { + return parseDateTime(createTimeEnd, true); + } + return parseDateTime(endTime, true); } private LocalDateTime parseDateTime(String text, boolean endOfDay) {