From 7d0342e7194291f74fbe24948e07d2bb0c154a72 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期一, 12 五月 2025 15:31:54 +0800
Subject: [PATCH] 最大需量发生记录分页,增加时间查询

---
 ansteel-biz/src/main/java/com/iailab/module/ansteel/power/dao/PowerMaxdemandMainDao.java |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 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 d9b5d45..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
@@ -1,15 +1,11 @@
 package com.iailab.module.ansteel.power.dao;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.iailab.framework.common.dao.BaseDao;
 import com.iailab.framework.common.pojo.PageResult;
 import com.iailab.framework.mybatis.core.mapper.BaseMapperX;
 import com.iailab.framework.mybatis.core.query.LambdaQueryWrapperX;
-import com.iailab.module.ansteel.api.dto.PowerMaxDemandMainDTO;
 import com.iailab.module.ansteel.api.vo.PowerMaxDemandMainPageReqVO;
 import com.iailab.module.ansteel.power.entity.PowerMaxdemandMainEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
 
 /**
  * @author PanZhibao
@@ -18,10 +14,14 @@
  */
 @Mapper
 public interface PowerMaxdemandMainDao extends BaseMapperX<PowerMaxdemandMainEntity> {
-    IPage<PowerMaxDemandMainDTO> getPage(IPage<PowerMaxdemandMainEntity> page, @Param("params") PowerMaxDemandMainPageReqVO reqVO);
 
-    default IPage<PowerMaxDemandMainDTO> selectPage(PowerMaxDemandMainPageReqVO params) {
-        return getPage(getPage(params), params);
+    default PageResult<PowerMaxdemandMainEntity> selectPage(PowerMaxDemandMainPageReqVO reqVO) {
+        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