From 3b75c8cf561035c41d25d5b8765a7c89375ca264 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期日, 12 五月 2024 08:00:32 +0800
Subject: [PATCH] 各bug修复；
---
performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java | 9 +++++++--
1 files changed, 7 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..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(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