From e2dba648a958d3f9181b0556c941f14d07477a64 Mon Sep 17 00:00:00 2001
From: JYW <2013732181@qq.com>
Date: 星期五, 10 五月 2024 17:34:49 +0800
Subject: [PATCH] 辅助工时单位字段修改和不合格品bug修改

---
 performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java |    9 ++++++---
 1 files changed, 6 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..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
@@ -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,11 @@
 
     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> exportToExcel(String time, String userName, String laboratory) throws Exception;
 }

--
Gitblit v1.9.3