From e604735ecb638053b03f2131997c455c403b7f1f Mon Sep 17 00:00:00 2001 From: yf001217 <834502597@qq.com> Date: Thu, 11 Jun 2026 17:01:18 +0800 Subject: [PATCH] =?UTF-8?q?pqc=E4=BB=BB=E5=8A=A1=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pojo/qo/QmsPqcTaskRecordSearchQO.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) 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) {