From 8aadcbe920f02806b9fa363b386d3d6c693c5c56 Mon Sep 17 00:00:00 2001
From: dongyukun <1208714201@qq.com>
Date: 星期五, 07 二月 2025 16:49:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/dao/StScheduleSchemeDao.java |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)

diff --git a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/dao/StScheduleSchemeDao.java b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/dao/StScheduleSchemeDao.java
index 6a87c53..b0480e7 100644
--- a/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/dao/StScheduleSchemeDao.java
+++ b/iailab-module-model/iailab-module-model-biz/src/main/java/com/iailab/module/model/mcs/sche/dao/StScheduleSchemeDao.java
@@ -1,12 +1,16 @@
 package com.iailab.module.model.mcs.sche.dao;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 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.api.mcs.dto.StAlarmAndSuggestPageReqVO;
+import com.iailab.module.model.api.mcs.dto.StAlarmAndSuggestRespVO;
 import com.iailab.module.model.mcs.sche.entity.StScheduleSchemeEntity;
 import com.iailab.module.model.mcs.sche.vo.StScheduleSchemePageReqVO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.Map;
 
@@ -21,6 +25,13 @@
     default PageResult<StScheduleSchemeEntity> selectPage(StScheduleSchemePageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<StScheduleSchemeEntity>()
                 .likeIfPresent(StScheduleSchemeEntity::getName, reqVO.getName())
+                .likeIfPresent(StScheduleSchemeEntity::getCode, reqVO.getCode())
                 .orderByDesc(StScheduleSchemeEntity::getCreateTime));
     }
+
+    IPage<StAlarmAndSuggestRespVO> getAlarmAndSuggestPage(IPage<StScheduleSchemeEntity> page, @Param("params") StAlarmAndSuggestPageReqVO reqVO);
+
+    default IPage<StAlarmAndSuggestRespVO> selectAlarmAndSuggestPageList(StAlarmAndSuggestPageReqVO reqVO) {
+        return getAlarmAndSuggestPage(getPage(reqVO), reqVO);
+    }
 }

--
Gitblit v1.9.3