From 7105265a2199ad452aac42b1aab617621abb4d02 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期三, 16 十月 2024 09:50:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java | 9 +++------
1 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java
index d977988..ce73d04 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/point/dao/DaPointDao.java
@@ -23,7 +23,7 @@
@Mapper
public interface DaPointDao extends BaseMapperX<DaPointEntity> {
- IPage<DaPointDTO> getPageList(IPage<DaPointEntity> page, @Param("params") Map<String, Object> params);
+ IPage<DaPointDTO> getPageList(IPage<DaPointEntity> page, @Param("params") DaPointPageReqVO reqVO);
List<DaPointDTO> getConstantPoint(Map<String, Object> params);
@@ -31,10 +31,7 @@
List<DaPointDTO> getMathPoint(Map<String, Object> params);
- default PageResult<DaPointEntity> selectPage(DaPointPageReqVO reqVO) {
- return selectPage(reqVO, new LambdaQueryWrapperX<DaPointEntity>()
- .likeIfPresent(DaPointEntity::getPointNo, reqVO.getPointNo())
- .likeIfPresent(DaPointEntity::getPointName, reqVO.getPointName())
- .orderByDesc(DaPointEntity::getCreateTime));
+ default IPage<DaPointDTO> selectPage(DaPointPageReqVO reqVO) {
+ return getPageList(getPage(reqVO), reqVO);
}
}
--
Gitblit v1.9.3