From bb79260cbeeac88cfbadc9606eea57002e8945bc Mon Sep 17 00:00:00 2001 From: baoshiwei <baoshiwei@shlanbao.cn> Date: 星期四, 17 四月 2025 09:43:16 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/main' --- eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintOrderServiceImpl.java | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintOrderServiceImpl.java b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintOrderServiceImpl.java index 529c96b..4b23e57 100644 --- a/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintOrderServiceImpl.java +++ b/eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintOrderServiceImpl.java @@ -112,6 +112,8 @@ qw.eq(bo.getStatus() != null, "mo.status", bo.getStatus()); qw.eq(bo.getPlanTime()!=null, "mo.plan_time", bo.getPlanTime()); + qw.between(params.get("beginPlanTime") != null && params.get("endPlanTime") != null, + "mo.plan_time", params.get("beginPlanTime"), params.get("endPlanTime")); qw.orderByDesc("mo.create_time"); return qw; } -- Gitblit v1.9.3