From c0fd46ed9c7ddf7a3ea4e6a972474e9a62c68a1a Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 22 七月 2024 19:59:10 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java b/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
index f9ef663..39157fe 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java
@@ -30,4 +30,10 @@
     List<Map<String, Object>> performanceShiftYearPage(@Param("time") String time,
                                                        @Param("userName") String userName,
                                                        @Param("laboratory") String laboratory);
+
+    IPage<Map<String, Object>> performanceShiftYear(Page<Object> page, String time, String userName, String laboratory);
+
+    List<Map<String, Object>> performanceShiftYearList(String time, String userName, String laboratory);
+
+    List<PerformanceShiftMapDto> performanceShiftList(String time, String userName, String laboratory);
 }

--
Gitblit v1.9.3