From b0cce93617ea3d4940f1304f2150d8481e1b8a2b Mon Sep 17 00:00:00 2001
From: 上海郢昱 <15922366+miu-haiqing@user.noreply.gitee.com>
Date: 星期一, 07 九月 2026 15:33:20 +0800
Subject: [PATCH] 不合格处理:OA回调新增结束标识字段,每个节点审批结束都更新一次流程信息

---
 performance-server/src/main/java/com/ruoyi/performance/service/PerformanceShiftService.java |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/PerformanceShiftService.java b/performance-server/src/main/java/com/ruoyi/performance/service/PerformanceShiftService.java
index c792180..1eafc0e 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/PerformanceShiftService.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/PerformanceShiftService.java
@@ -6,6 +6,10 @@
 import com.ruoyi.performance.dto.PerformanceShiftAddDto;
 import com.ruoyi.performance.pojo.PerformanceShift;
 
+import javax.servlet.http.HttpServletResponse;
+import javax.validation.constraints.NotNull;
+import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -20,15 +24,15 @@
 
     void performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto);
 
-    Map<String, Object> performanceShiftPage(Page<Object> page, String time, String userName, String laboratory);
+    Map<String, Object> performanceShift(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);
+    List<Map<String, Object>> performanceShiftPageYear(LocalDateTime time, String userName, String laboratory);
 
     boolean editAnnotationText(PerformanceShift performanceShift);
+
+    void exportToExcel(LocalDateTime time, String userName, String laboratory, Boolean isMonth, HttpServletResponse response);
+
+    boolean delShift(PerformanceShiftAddDto performanceShiftAddDto);
 }

--
Gitblit v1.9.3