From 443a9510ba9c032d83139048f73201706a1d9c45 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 10 五月 2024 22:19:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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 5315122..e671f1a 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,11 @@
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> exportToExcel(String time, String userName, String laboratory) throws Exception;
}
--
Gitblit v1.9.3