From afa8fc57084c423218c6816b710dfb2f0b87ea89 Mon Sep 17 00:00:00 2001
From: 潘志宝 <979469083@qq.com>
Date: 星期四, 14 十一月 2024 15:55:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/dao/ScheduleJobDao.java |   28 +++++++++++++++-------------
 1 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/dao/ScheduleJobDao.java b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/dao/ScheduleJobDao.java
index d472df5..90209d7 100644
--- a/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/dao/ScheduleJobDao.java
+++ b/iailab-module-data/iailab-module-data-biz/src/main/java/com/iailab/module/data/job/dao/ScheduleJobDao.java
@@ -1,18 +1,11 @@
-/**
- * Copyright (c) 2018 人人开源 All rights reserved.
- *
- * https://www.renren.io
- *
- * 版权所有,侵权必究!
- */
-
 package com.iailab.module.data.job.dao;
 
-import com.iailab.framework.common.dao.BaseDao;
+import com.baomidou.dynamic.datasource.annotation.Master;
+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.data.job.entity.ScheduleJobEntity;
-import com.iailab.module.data.job.entity.ScheduleJobEntity;
-import com.iailab.module.data.job.entity.ScheduleJobEntity;
-import com.iailab.module.data.job.entity.ScheduleJobEntity;
+import com.iailab.module.data.job.vo.ScheduleJobReqVO;
 import org.apache.ibatis.annotations.Mapper;
 
 import java.util.Map;
@@ -22,8 +15,17 @@
  *
  * @author Mark sunlightcs@gmail.com
  */
+@Master
 @Mapper
-public interface ScheduleJobDao extends BaseDao<ScheduleJobEntity> {
+public interface ScheduleJobDao extends BaseMapperX<ScheduleJobEntity> {
+
+	default PageResult<ScheduleJobEntity> selectPage(ScheduleJobReqVO reqVO) {
+		return selectPage(reqVO, new LambdaQueryWrapperX<ScheduleJobEntity>()
+				.likeIfPresent(ScheduleJobEntity::getBeanName, reqVO.getBeanName())
+				.eqIfPresent(ScheduleJobEntity::getTenantId, reqVO.getTenantId())
+				.orderByDesc(ScheduleJobEntity::getCreateDate));
+
+	}
 	
 	/**
 	 * 批量更新状态

--
Gitblit v1.9.3