From 48b69b857ae860050a790be63b317e15be49f1b1 Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期二, 13 五月 2025 16:57:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ansteel-biz/src/main/java/com/iailab/module/ansteel/power/dao/PowerMaxdemandMainDao.java | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/dao/PowerMaxdemandMainDao.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/dao/PowerMaxdemandMainDao.java
index a97a23d..c7b342b 100644
--- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/dao/PowerMaxdemandMainDao.java
+++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/power/dao/PowerMaxdemandMainDao.java
@@ -19,6 +19,8 @@
return selectPage(reqVO, new LambdaQueryWrapperX<PowerMaxdemandMainEntity>()
.likeIfPresent(PowerMaxdemandMainEntity::getName, reqVO.getName())
.eqIfPresent(PowerMaxdemandMainEntity::getCode, reqVO.getCode())
+ .geIfPresent(PowerMaxdemandMainEntity::getOccurTime, reqVO.getStartTime())
+ .le(PowerMaxdemandMainEntity::getOccurTime, reqVO.getEndTime())
.orderByDesc(PowerMaxdemandMainEntity::getOccurTime));
}
--
Gitblit v1.9.3