From 35d63c6a7be309a102a2d42f4648b9f4b887d319 Mon Sep 17 00:00:00 2001 From: Crunchy <3114200645@qq.com> Date: 星期二, 30 七月 2024 19:19:28 +0800 Subject: [PATCH] 检验下单的分页查询展示的字段去掉下单人,然后制单人和委托人对应的数据反了 --- performance-server/src/main/java/com/yuanchu/mom/service/PerformanceShiftService.java | 10 ++++++++-- 1 files changed, 8 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 1274d30..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 @@ -20,7 +20,13 @@ void performanceShiftAdd(PerformanceShiftAddDto performanceShiftAddDto); - IPage<Map<String, Object>> 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> exportToYearExcel(String time, String userName, String laboratory) throws Exception; + + Map<Object, Object> exportToMonthExcel(String time, String userName, String laboratory); } -- Gitblit v1.9.3