From c8355d4a1f27716edc510d936b6a7982b0ab99b3 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 24 三月 2025 13:37:26 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/tx-lims-after
---
performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java b/performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java
index af0682c..8a4ec3a 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java
@@ -4,8 +4,9 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.IService;
import com.yuanchu.mom.dto.PerformanceShiftAddDto;
-import com.yuanchu.mom.dto.PerformanceShiftMapDto;
import com.yuanchu.mom.pojo.PerformanceShift;
+
+import java.util.Map;
/**
* <p>
@@ -19,7 +20,13 @@
void performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto);
- IPage<PerformanceShiftMapDto> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory);
+ Map<String, Object> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory);
void performanceShiftUpdate(PerformanceShift performanceShift);
+
+ IPage<Map<String, Object>> performanceShiftPageYear(Page<Object> page, String time, String userName, String laboratory);
+
+ Map<Object, Object> exportToYearExcel(String time, String userName, String laboratory) throws Exception;
+
+ Map<Object, Object> exportToMonthExcel(String time, String userName, String laboratory);
}
--
Gitblit v1.9.3