From 79841a6a5ecd713a9f02d23552619cbba1c991ad Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期五, 06 三月 2026 17:42:40 +0800
Subject: [PATCH] fix:班次页面问题修复
---
performance-server/src/main/java/com/ruoyi/performance/mapper/PerformanceShiftMapper.java | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/mapper/PerformanceShiftMapper.java b/performance-server/src/main/java/com/ruoyi/performance/mapper/PerformanceShiftMapper.java
index b339b4f..9b3bfda 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/mapper/PerformanceShiftMapper.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/mapper/PerformanceShiftMapper.java
@@ -7,6 +7,7 @@
import com.ruoyi.performance.pojo.PerformanceShift;
import org.apache.ibatis.annotations.Param;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -20,9 +21,9 @@
*/
public interface PerformanceShiftMapper extends MyBaseMapper<PerformanceShift> {
- IPage<PerformanceShiftMapDto> performanceShiftPage(
- Page<Object> page,
- @Param("time") String time,
+ List<PerformanceShiftMapDto> performanceShift(
+ @Param("firstDayOfMonth") LocalDate firstDayOfMonth,
+ @Param("lastDayOfMonth") LocalDate lastDayOfMonth,
@Param("userName") String userName,
@Param("laboratory") String laboratory
);
@@ -31,7 +32,7 @@
@Param("userName") String userName,
@Param("laboratory") String laboratory);
- IPage<Map<String, Object>> performanceShiftYear(@Param("page") Page<Object> page, @Param("time") String time, @Param("userName") String userName, @Param("laboratory") String laboratory);
+ List<PerformanceShiftMapDto> performanceShiftYear(@Param("time") String time, @Param("userName") String userName, @Param("laboratory") String laboratory);
List<Map<String, Object>> performanceShiftYearList(@Param("time") String time, @Param("userName") String userName, @Param("laboratory") String laboratory);
--
Gitblit v1.9.3