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/AuxiliaryOutputWorkingHoursController.java | 24 ++++--------------------
1 files changed, 4 insertions(+), 20 deletions(-)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryOutputWorkingHoursController.java b/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryOutputWorkingHoursController.java
index 5fb7d13..1cc514b 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryOutputWorkingHoursController.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryOutputWorkingHoursController.java
@@ -1,5 +1,4 @@
package com.ruoyi.performance.controller;
-
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.utils.JackSonUtil;
@@ -32,21 +31,19 @@
@Resource
private AuxiliaryOutputWorkingHoursService auxiliaryOutputWorkingHoursService;
- @ApiOperation(value = "鏌ヨ浜ч噺宸ユ椂")
- @PostMapping("/selectAuxiliaryOutputWorkingHours")
+ @ApiOperation(value = "鏃ュ伐鏃剁鐞�-鏌ョ湅浜ч噺宸ユ椂鍒楄〃")
+ @GetMapping("/selectAuxiliaryOutputWorkingHours")
public Result selectAuxiliaryOutputWorkingHours(Page page,AuxiliaryOutputWorkingHoursDto entity) throws Exception {
return Result.success(auxiliaryOutputWorkingHoursService.selectAuxiliaryOutputWorkingHours(page, entity));
}
@ApiOperation(value = "缁熻浜ч噺宸ユ椂姹囨�诲拰杈呭姪宸ユ椂姹囨��")
@PostMapping("/collectWorkingHours")
- public Result collectWorkingHours(@RequestBody Map<String, Object> data)throws Exception{
- AuxiliaryOutputWorkingHoursDto entity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), AuxiliaryOutputWorkingHoursDto.class);
+ public Result collectWorkingHours(@RequestBody AuxiliaryOutputWorkingHoursDto entity)throws Exception{
return Result.success(auxiliaryOutputWorkingHoursService.collectWorkingHours(entity));
}
-
- @ApiOperation(value = "瀵煎嚭浜ч噺宸ユ椂+杈呭姪宸ユ椂")
+ @ApiOperation(value = "鏃ュ伐鏃剁鐞�-瀵煎嚭")
@GetMapping("/exportWorkingHours")
public void exportWorkingHours(HttpServletResponse response) throws IOException {
auxiliaryOutputWorkingHoursService.exportWorkingHours(response);
@@ -56,19 +53,6 @@
@PostMapping("/leader")
public Result leader() {
return Result.success();
- }
-
-
- /**
- * 瀵煎嚭浜ч噺宸ユ椂
- * @param response
- * @throws IOException
- */
- @ApiOperation(value = "瀵煎嚭浜ч噺宸ユ椂")
- @PostMapping("/exportOutputHours")
- public void exportOutputHours(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
- AuxiliaryOutputWorkingHoursDto entity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), AuxiliaryOutputWorkingHoursDto.class);
- auxiliaryOutputWorkingHoursService.exportOutputHours(entity, response);
}
}
--
Gitblit v1.9.3