From 19ef4ca4f7252c34fe2e2a03b8868fc997ddd86f Mon Sep 17 00:00:00 2001
From: dengzedong <dengzedong@email>
Date: 星期五, 13 九月 2024 08:37:38 +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 | 20 ++++++++++++++++----
1 files changed, 16 insertions(+), 4 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 c0678b2..d977988 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
@@ -1,9 +1,13 @@
package com.iailab.module.data.point.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.framework.tenant.core.db.dynamic.TenantDS;
import com.iailab.module.data.point.dto.DaPointDTO;
import com.iailab.module.data.point.entity.DaPointEntity;
+import com.iailab.module.data.point.vo.DaPointPageReqVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -11,12 +15,13 @@
import java.util.Map;
/**
- * @author PanZhibao
+ * @author lirm
* @Description
- * @createTime 2022年07月12日 13:47:00
+ * @createTime 2024年09月2日
*/
+@TenantDS
@Mapper
-public interface DaPointDao extends BaseDao<DaPointEntity> {
+public interface DaPointDao extends BaseMapperX<DaPointEntity> {
IPage<DaPointDTO> getPageList(IPage<DaPointEntity> page, @Param("params") Map<String, Object> params);
@@ -25,4 +30,11 @@
List<DaPointDTO> getMeasurePoint(Map<String, Object> params);
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));
+ }
}
--
Gitblit v1.9.3