From 31f3dcc7c566174cbdec4f41a9a96e58a1be9a4e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 17 十二月 2024 16:20:12 +0800
Subject: [PATCH] 统计2.0+首页2.0+检验下单型号过滤修改

---
 performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java
index eb82628..3b3a36b 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryOutputWorkingHoursController.java
@@ -46,16 +46,17 @@
         return Result.success(auxiliaryOutputWorkingHoursService.selectAuxiliaryOutputWorkingHours(page, entity));
     }
 
-    @ValueClassify("宸ユ椂绠$悊")
+    @ValueAuth
     @ApiOperation(value = "缁熻浜ч噺宸ユ椂姹囨�诲拰杈呭姪宸ユ椂姹囨��")
     @PostMapping("/collectWorkingHours")
-    public Result collectWorkingHours(){
-      return Result.success(auxiliaryOutputWorkingHoursService.collectWorkingHours());
+    public Result collectWorkingHours(@RequestBody Map<String, Object> data)throws Exception{
+        AuxiliaryOutputWorkingHoursDto entity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), AuxiliaryOutputWorkingHoursDto.class);
+        return Result.success(auxiliaryOutputWorkingHoursService.collectWorkingHours(entity));
     }
 
 
     @ValueClassify("宸ユ椂绠$悊")
-    @ApiOperation(value = "瀵煎嚭")
+    @ApiOperation(value = "瀵煎嚭浜ч噺宸ユ椂+杈呭姪宸ユ椂")
     @GetMapping("/exportWorkingHours")
     public void exportWorkingHours(HttpServletResponse response) throws IOException {
         auxiliaryOutputWorkingHoursService.exportWorkingHours(response);

--
Gitblit v1.9.3