From fbbfb006e1d745ca3b7ae9ef497c06da4128f380 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 22 四月 2026 17:58:05 +0800
Subject: [PATCH] 报告编制：印章生成调整
---
performance-server/src/main/java/com/ruoyi/performance/mapper/PerformanceShiftMapper.java | 20 ++++++++++++--------
1 files changed, 12 insertions(+), 8 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..e595092 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
@@ -5,8 +5,11 @@
import com.ruoyi.framework.mybatis_config.MyBaseMapper;
import com.ruoyi.performance.dto.PerformanceShiftMapDto;
import com.ruoyi.performance.pojo.PerformanceShift;
+import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
import java.util.List;
import java.util.Map;
@@ -18,24 +21,25 @@
* @author 姹熻嫃榈烽洀缃戠粶绉戞妧鏈夐檺鍏徃
* @since 2024-05-08 09:12:04
*/
+@Mapper
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
);
- List<Map<String, Object>> performanceShiftYearPage(@Param("time") String time,
- @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("startDateTime") LocalDateTime startDateTime,
+ @Param("endDateTime") LocalDateTime endDateTime, @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);
List<PerformanceShiftMapDto> performanceShiftList(@Param("time") String time, @Param("userName") String userName, @Param("laboratory") String laboratory);
String seldepLimsId(@Param("depLimsId") int depLimsId);
+
+ List<PerformanceShiftMapDto> selectListByWorkTime(@Param("startTime") LocalDateTime startTime,@Param("endTime") LocalDateTime endTime,@Param("keyword") String keyword);
+
}
--
Gitblit v1.9.3