From 24019a8c1d8e78656e85b29ee7be223e0dd253a0 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期五, 05 六月 2026 09:11:33 +0800
Subject: [PATCH] Merge branch 'dev_new' of http://114.132.189.42:9002/r/lims-ruoyi-after into dev_new
---
performance-server/src/main/java/com/ruoyi/performance/mapper/PerformanceShiftMapper.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 091ad29..b339b4f 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,7 +5,7 @@
import com.ruoyi.framework.mybatis_config.MyBaseMapper;
import com.ruoyi.performance.dto.PerformanceShiftMapDto;
import com.ruoyi.performance.pojo.PerformanceShift;
-import org.springframework.data.repository.query.Param;
+import org.apache.ibatis.annotations.Param;
import java.util.List;
import java.util.Map;
@@ -31,11 +31,11 @@
@Param("userName") String userName,
@Param("laboratory") String laboratory);
- IPage<Map<String, Object>> performanceShiftYear(Page<Object> page, String time, String userName, 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<Map<String, Object>> performanceShiftYearList(String time, String userName, String laboratory);
+ List<Map<String, Object>> performanceShiftYearList(@Param("time") String time, @Param("userName") String userName, @Param("laboratory") String laboratory);
- List<PerformanceShiftMapDto> performanceShiftList(String time, String userName, String laboratory);
+ List<PerformanceShiftMapDto> performanceShiftList(@Param("time") String time, @Param("userName") String userName, @Param("laboratory") String laboratory);
- String seldepLimsId(int depLimsId);
+ String seldepLimsId(@Param("depLimsId") int depLimsId);
}
--
Gitblit v1.9.3