From 10de56ca16261e6a4eec49dfd32f0a6b232f7baf Mon Sep 17 00:00:00 2001
From: 晏有为 <13214124+yan-youwei@user.noreply.gitee.com>
Date: 星期四, 23 五月 2024 19:05:08 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java | 11 ++++++++---
1 files changed, 8 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 7e9a5a5..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
@@ -6,7 +6,6 @@
import com.yuanchu.mom.dto.PerformanceShiftAddDto;
import com.yuanchu.mom.pojo.PerformanceShift;
-import java.time.LocalDateTime;
import java.util.Map;
/**
@@ -21,7 +20,13 @@
void performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto);
- IPage<Map<String, Object>> performanceShiftPage(Page<Object> page, LocalDateTime 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