From 51ec98113c6d49d0f7eec4e3c030e55e337e97db Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 26 五月 2025 15:47:16 +0800
Subject: [PATCH] 芯导软件(江苏)有限公司  delete

---
 performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 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 5315122..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(String shift, Integer id);
+    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