From a465f67fdd32f818f35938eded708b166b1cc1f7 Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 20 二月 2025 10:25:37 +0800 Subject: [PATCH] 搬迁cnas的8体系管理要求模块完成 --- performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryOutputWorkingHoursController.java | 12 +++++------- 1 files changed, 5 insertions(+), 7 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..2bd041b 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 @@ -33,15 +33,14 @@ private AuxiliaryOutputWorkingHoursService auxiliaryOutputWorkingHoursService; @ApiOperation(value = "鏌ヨ浜ч噺宸ユ椂") - @PostMapping("/selectAuxiliaryOutputWorkingHours") + @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); + @GetMapping("/collectWorkingHours") + public Result collectWorkingHours(AuxiliaryOutputWorkingHoursDto entity)throws Exception{ return Result.success(auxiliaryOutputWorkingHoursService.collectWorkingHours(entity)); } @@ -65,9 +64,8 @@ * @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); + @GetMapping("/exportOutputHours") + public void exportOutputHours(AuxiliaryOutputWorkingHoursDto entity, HttpServletResponse response) throws Exception { auxiliaryOutputWorkingHoursService.exportOutputHours(entity, response); } -- Gitblit v1.9.3