From a5b1bad21ba279ade3954852a5e281e9086042f0 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 26 十一月 2024 15:22:52 +0800
Subject: [PATCH] 前端联调修改2.0

---
 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