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; }