From 9a869e800b235636097abebadb1bd1cae4206cbc Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期二, 04 六月 2024 21:21:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOriginalHoursController.java | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOriginalHoursController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOriginalHoursController.java
index 191e4c5..8658998 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOriginalHoursController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOriginalHoursController.java
@@ -11,12 +11,11 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.util.Map;
@Api(tags = "宸ユ椂缁熻-鍘熷宸ユ椂")
@@ -36,4 +35,11 @@
AuxiliaryOriginalHoursLookDto entity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), AuxiliaryOriginalHoursLookDto.class);
return Result.success(auxiliaryOriginalHoursService.selectAuxiliaryOriginalHours(page, entity));
}
+
+ @ValueClassify("宸ユ椂绠＄悊")
+ @ApiOperation(value = "瀵煎嚭鍘熷宸ユ椂")
+ @GetMapping("/exportOriginalHours")
+ public void exportOriginalHours(@RequestBody AuxiliaryOriginalHoursLookDto auxiliaryOriginalHoursLookDto,HttpServletResponse response) throws IOException {
+ auxiliaryOriginalHoursService.exportWorkingHours(auxiliaryOriginalHoursLookDto,response);
+ }
}
--
Gitblit v1.9.3