From d74c28c6f826c9d9e61612b4bc589b0774feb82a Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 10 五月 2024 13:30:09 +0800
Subject: [PATCH] 2024-5-9 绩效管理-班次后端开发调整年份完成

---
 performance-server/src/main/java/com/yuanchu/mom/mapper/PerformanceShiftMapper.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 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 3f54661..2623b39 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
@@ -2,11 +2,12 @@
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.dto.PerformanceShiftMapDto;
+import com.yuanchu.mom.mybatis_config.MyBaseMapper;
 import com.yuanchu.mom.pojo.PerformanceShift;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.springframework.data.repository.query.Param;
 
-import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -17,12 +18,20 @@
  * @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
  * @since 2024-05-08 09:12:04
  */
-public interface PerformanceShiftMapper extends BaseMapper<PerformanceShift> {
+public interface PerformanceShiftMapper extends MyBaseMapper<PerformanceShift> {
 
-    IPage<Map<String, Object>> performanceShiftPage(
+    IPage<PerformanceShiftMapDto> performanceShiftPage(
             Page<Object> page,
-            @Param("time") LocalDateTime time,
+            @Param("time") String time,
             @Param("userName") String userName,
             @Param("laboratory") String laboratory
     );
+
+    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);
 }

--
Gitblit v1.9.3