From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面:月度统计时间调整为上月26到本月25;班次支持右键添加批注 2.外购下单:KJNS域订单免检自动更新批次属性;外购下单-全部页新增【更新IFS批次属性】按钮,支持更新已提交订单的批次属性 3.资源要求-设备:设备核查计划:核查负责人回显问题修复;设备使用授权:检验项目导出数据错误问题修复
---
performance-server/src/main/java/com/ruoyi/performance/mapper/PerformanceShiftMapper.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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..29a4691 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,9 @@
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.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -22,7 +23,8 @@
IPage<PerformanceShiftMapDto> performanceShiftPage(
Page<Object> page,
- @Param("time") String time,
+ @Param("firstDayOfMonth") LocalDate firstDayOfMonth,
+ @Param("lastDayOfMonth") LocalDate lastDayOfMonth,
@Param("userName") String userName,
@Param("laboratory") String laboratory
);
@@ -31,11 +33,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