From fd45857d93665dc1b432b72f8ea9d5de42c5bab2 Mon Sep 17 00:00:00 2001 From: zch Date: Fri, 25 Jul 2025 13:56:08 +0800 Subject: [PATCH] =?UTF-8?q?feat(qms):=20=E5=A2=9E=E5=8A=A0=E6=A3=80?= =?UTF-8?q?=E9=AA=8C=E6=97=B6=E9=97=B4=E5=92=8C=E5=AE=A1=E6=A0=B8=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E7=9A=84=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E7=AD=9B?= =?UTF-8?q?=E9=80=89=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在 QcInspectionMainServiceImpl 中添加开始检验时间的筛选 - 在 QcUnqualifiedReviewServiceImpl 中添加开始审核时间的筛选 - 通过参数 beginInspectionStartTime 和 endInspectionStartTime 实现检验时间筛选 - 通过参数 beginReviewStartTime 和 endReviewStartTime 实现审核时间筛选 --- .../qms/service/impl/QcInspectionMainServiceImpl.java | 10 ++++++++++ .../service/impl/QcUnqualifiedReviewServiceImpl.java | 10 ++++++++++ 2 files changed, 20 insertions(+) diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java index d99e5e4..14b636e 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcInspectionMainServiceImpl.java @@ -105,6 +105,16 @@ public class QcInspectionMainServiceImpl implements IQcInspectionMainService { .eq(StringUtils.isNotBlank(bo.getBarcode()), QcInspectionMain::getBarcode, bo.getBarcode()) .like(StringUtils.isNotBlank(bo.getSupplierName()), QcInspectionMain::getSupplierName, bo.getSupplierName()) .orderByDesc(QcInspectionMain::getCreateTime); + + Object beginInspectionStartTime = params.get("beginInspectionStartTime"); + Object endInspectionStartTime = params.get("endInspectionStartTime"); + + if (beginInspectionStartTime != null) { + lqw.ge(QcInspectionMain::getInspectionStartTime, beginInspectionStartTime); + } + if (endInspectionStartTime != null) { + lqw.le(QcInspectionMain::getInspectionStartTime, endInspectionStartTime); + } return lqw; } diff --git a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcUnqualifiedReviewServiceImpl.java b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcUnqualifiedReviewServiceImpl.java index 7ed6b97..d1350ac 100644 --- a/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcUnqualifiedReviewServiceImpl.java +++ b/ruoyi-modules/hwmom-qms/src/main/java/org/dromara/qms/service/impl/QcUnqualifiedReviewServiceImpl.java @@ -96,6 +96,16 @@ public class QcUnqualifiedReviewServiceImpl implements IQcUnqualifiedReviewServi .eq(bo.getReviewStartTime() != null, QcUnqualifiedReview::getReviewStartTime, bo.getReviewStartTime()) .eq(bo.getReviewEndTime() != null, QcUnqualifiedReview::getReviewEndTime, bo.getReviewEndTime()) .orderByDesc(QcUnqualifiedReview::getCreateTime); + + Object beginReviewStartTime = params.get("beginReviewStartTime"); + Object endReviewStartTime = params.get("endReviewStartTime"); + + if (beginReviewStartTime != null) { + lqw.ge(QcUnqualifiedReview::getReviewStartTime, beginReviewStartTime); + } + if (endReviewStartTime != null) { + lqw.le(QcUnqualifiedReview::getReviewStartTime, endReviewStartTime); + } return lqw; }