From 5247f5d991b09bef8dce64ca8fac0e9c804f4584 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期四, 24 四月 2025 09:10:22 +0800
Subject: [PATCH] feat(eims): 优化数据导入功能并添加创建时间排序
---
eims/ruoyi-modules/lb-eims/src/main/java/org/dromara/eims/service/impl/EimsMaintOrderServiceImpl.java | 4 ++++
1 files changed, 4 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..d7cf570 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;
}
@@ -174,6 +176,8 @@
lqw.eq(StringUtils.isNotBlank(bo.getStatus()), EimsMaintOrder::getStatus, bo.getStatus());
lqw.eq(bo.getPlanTime() != null, EimsMaintOrder::getPlanTime, bo.getPlanTime());
lqw.eq(bo.getPlanId() != null, EimsMaintOrder::getPlanId, bo.getPlanId());
+ // 鎸夊垱寤烘椂闂村�掑簭
+ lqw.orderByDesc(EimsMaintOrder::getCreateTime);
return lqw;
}
--
Gitblit v1.9.3