From 52d79c7e5a1fb4316f34886ec336f69f56d5edb2 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 10:48:46 +0800
Subject: [PATCH] 工时管理日工时管理以及辅助工时配置
---
performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryOriginalHoursController.java | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryOriginalHoursController.java b/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryOriginalHoursController.java
index e70636c..c3f03e6 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryOriginalHoursController.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryOriginalHoursController.java
@@ -24,21 +24,20 @@
@Resource
AuxiliaryOriginalHoursService auxiliaryOriginalHoursService;
- @ApiOperation(value = "鏌ヨ鍘熷宸ユ椂")
- @PostMapping("/selectAuxiliaryOriginalHours")
+ @ApiOperation(value = "宸ユ椂缁熻-鏌ョ湅鍘熷宸ユ椂鍒楄〃")
+ @GetMapping("/selectAuxiliaryOriginalHours")
public Result selectAuxiliaryOriginalHours(Page page, AuxiliaryOriginalHoursLookDto entity) throws Exception {
return Result.success(auxiliaryOriginalHoursService.selectAuxiliaryOriginalHours(page, entity));
}
- @ApiOperation(value = "瀵煎嚭鍘熷宸ユ椂")
+ @ApiOperation(value = "宸ユ椂缁熻-瀵煎嚭鍘熷宸ユ椂")
@PostMapping("/exportOriginalHours")
- public void exportOriginalHours(@RequestParam("month") String month, @RequestParam("name") String name, @RequestParam("departLims") String departLims,HttpServletResponse response) throws IOException {
- auxiliaryOriginalHoursService.exportWorkingHours(month,name,departLims,response);
- }
-
- @ApiOperation(value = "鏌ヨ鏈堜唤鍏ㄩ儴宸ユ椂")
- @PostMapping("/selectAuxiliaryAllByMonth")
- public Result selectAuxiliaryAllByMonth(@RequestBody AuxiliaryOriginalHoursLookDto dto){
- return Result.success(auxiliaryOriginalHoursService.selectAuxiliaryAllByMonth(dto));
+ public void exportOriginalHours(
+ Page page,
+ @RequestParam("month") String month,
+ @RequestParam(value = "name",required = false) String name,
+ @RequestParam(value = "departLims",required = false) String departLims,
+ HttpServletResponse response) throws IOException {
+ auxiliaryOriginalHoursService.exportWorkingHours(page,month,name,departLims,response);
}
}
--
Gitblit v1.9.3