From 1f6ff03df42388413846fb4b2571d6b010ef3306 Mon Sep 17 00:00:00 2001
From: liriming <1343021927@qq.com>
Date: 星期一, 23 九月 2024 08:35:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/dao/MmPredictItemDao.java |   19 +++++++++++--------
 1 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/dao/MmPredictItemDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/dao/MmPredictItemDao.java
index abfd1a0..b472ede 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/dao/MmPredictItemDao.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/pre/dao/MmPredictItemDao.java
@@ -4,8 +4,11 @@
 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.model.mcs.pre.entity.MmPredictItemEntity;
 import com.iailab.module.model.mcs.pre.entity.MmPredictItemEntity;
+import com.iailab.module.model.mcs.pre.entity.MmPredictItemEntity;
+import com.iailab.module.model.mcs.pre.vo.DmModulePageReqVO;
 import com.iailab.module.model.mcs.pre.vo.MmPredictItemPageReqVO;
 import com.iailab.module.model.mcs.pre.vo.MmPredictItemRespVO;
 import com.iailab.module.model.mdk.vo.ItemVO;
@@ -20,20 +23,20 @@
  * @author PanZhibao
  * @date 2021年04月26日 11:35
  */
+@TenantDS
 @Mapper
 public interface MmPredictItemDao extends BaseMapperX<MmPredictItemEntity> {
-
-    /**
-     * 查询列表
-     *
-     * @param params
-     * @return
-     */
-    IPage<MmPredictItemRespVO> getPageList(IPage<MmPredictItemEntity> page, @Param("params") Map<String, Object> params);
 
     List<ItemVO> getByModuleId(Map<String, Object> params);
 
     List<ItemVO> getItem(Map<String, Object> params);
 
     List<MergeItemVO> getMergeItemByItemId(Map<String, Object> params);
+
+    default PageResult<MmPredictItemEntity> selectPage(MmPredictItemPageReqVO reqVO) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<MmPredictItemEntity>()
+                .likeIfPresent(MmPredictItemEntity::getItemno, reqVO.getItemno())
+                .likeIfPresent(MmPredictItemEntity::getItemname, reqVO.getItemname())
+                .orderByDesc(MmPredictItemEntity::getCreateTime));
+    }
 }

--
Gitblit v1.9.3