From db05e7296bcef514ae3f204971ebbdd502019041 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 10 五月 2024 13:30:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
index 65b368a..30f16ae 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/PerformanceShiftController.java
@@ -34,10 +34,16 @@
return Result.success();
}
- @ApiOperation(value = "缁╂晥绠＄悊-鐝-鍒嗛〉鏌ヨ")
+ @ApiOperation(value = "缁╂晥绠＄悊-鐝-鏈堜唤鍒嗛〉鏌ヨ")
@PostMapping("page")
public Result<?> performanceShiftPage(Integer size, Integer current, String time, String userName, String laboratory) {
return Result.success(performanceShiftService.performanceShiftPage(new Page<>(current, size), time, userName, laboratory));
+ }
+
+ @ApiOperation(value = "缁╂晥绠＄悊-鐝-骞翠唤鍒嗛〉鏌ヨ")
+ @PostMapping("pageYear")
+ public Result<?> performanceShiftPageYear(Integer size, Integer current, String time, String userName, String laboratory) {
+ return Result.success(performanceShiftService.performanceShiftPageYear(new Page<>(current, size), time, userName, laboratory));
}
@ApiOperation(value = "缁╂晥绠＄悊-鐝-鐝鐘舵�佷慨鏀�")
@@ -46,4 +52,11 @@
performanceShiftService.performanceShiftUpdate(performanceShift);
return Result.success();
}
+
+ @ApiOperation(value = "缁╂晥绠＄悊-鐝-瀵煎嚭")
+ @GetMapping("update")
+ public Result<?> exportToExcel(String time, String userName, String laboratory) {
+ performanceShiftService.exportToExcel(time, userName, laboratory);
+ return Result.success();
+ }
}
--
Gitblit v1.9.3