From 9f8f9d13c42ca8cdccbf351069082a5fdccef2e4 Mon Sep 17 00:00:00 2001
From: lin <sbla5888@163.com>
Date: Mon, 25 Mar 2024 17:30:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.java b/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.java
index 470c80a..d4a7900 100644
--- a/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.java
+++ b/src/main/java/org/springblade/modules/checkInRecords/mapper/CheckInRecordsMapper.java
@@ -39,7 +39,16 @@
* @param checkInRecords
* @return
*/
- List<CheckInRecordsVO> selectCheckInRecordsPage(IPage page, @Param("checkInRecords") CheckInRecordsVO checkInRecords);
+ List<CheckInRecordsVO> selectCheckInRecordsPage(IPage page,
+ @Param("checkInRecords") CheckInRecordsVO checkInRecords,
+ @Param("deptIdList") List<Long> deptIdList);
+
+
+// List<CheckInRecordsVO> selectCheckInRecordsPage(IPage<CheckInRecordsVO> page,
+// @Param("checkInRecords")CheckInRecordsVO checkInRecords,
+// @Param("isAdministrator") Integer isAdministrator,
+// @Param("gridCodeList")List gridCodeList,
+// @Param("regionChildCodesList")List regionChildCodesList);
/**
@@ -57,4 +66,5 @@
* @return 打卡记录表集合
*/
public List<CheckInRecordsDTO> selectCheckInRecordsList(CheckInRecordsDTO checkInRecordsDTO);
+
}
--
Gitblit v1.9.3