From 85d76785cd5a49ee4e942419afd197bc7ee97d68 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 07 六月 2024 11:34:01 +0800
Subject: [PATCH] 工时bug修改+用户过滤10003

---
 performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
index 471e07f..f7b7ec6 100644
--- a/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
+++ b/performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java
@@ -49,49 +49,49 @@
     }
 
     @ValueClassify("宸ユ椂绠＄悊")
-    @ApiOperation(value = "鏍规嵁缂栧彿鏌ヨ杈呭姪宸ユ椂閰嶇疆淇℃伅")
+    //@ApiOperation(value = "鏍规嵁缂栧彿鏌ヨ杈呭姪宸ユ椂閰嶇疆淇℃伅")
     @PostMapping("/selectAuxiliaryWorkingHoursByNumber")
     public Result selectAuxiliaryWorkingHoursByNumber(String number) {
         return Result.success(auxiliaryWorkingHoursDayService.selectAuxiliaryWorkingHoursByNumber(number));
     }
 
     @ValueClassify("宸ユ椂绠＄悊")
-    @ApiOperation(value = "鏍规嵁缂栧彿褰撳墠鐢ㄦ埛淇℃伅鏌ヨ鎵�鍦ㄧ彮娆�")
+    //@ApiOperation(value = "鏍规嵁缂栧彿褰撳墠鐢ㄦ埛淇℃伅鏌ヨ鎵�鍦ㄧ彮娆�")
     @PostMapping("/selectshiftByUser")
     public Result selectshiftByUser(LocalDateTime dateTime) {
         return Result.success(auxiliaryWorkingHoursDayService.selectshiftByUser(dateTime));
     }
 
     @ValueClassify("宸ユ椂绠＄悊")
-    @ApiOperation(value = "褰曞叆鏁版嵁(鏂板)")
+    @ApiOperation(value = "褰曞叆鏁版嵁(杈呭姪宸ユ椂)")
     @PostMapping("/insertAuxiliaryWorkingHoursDay")
     public Result insertAuxiliaryWorkingHoursDay(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
         return Result.success(auxiliaryWorkingHoursDayService.insertAuxiliaryWorkingHoursDay(auxiliaryWorkingHoursDay));
     }
 
     @ValueClassify("宸ユ椂绠＄悊")
-    @ApiOperation(value = "鎵瑰噯")
+    @ApiOperation(value = "鎵瑰噯杈呭姪宸ユ椂")
     @PostMapping("/approve")
-    public Result approve(Integer id, String state) {
-        return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(id,state));
+    public Result approve(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
+        return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(auxiliaryWorkingHoursDay));
     }
 
     @ValueClassify("宸ユ椂绠＄悊")
-    @ApiOperation(value = "瀹℃牳")
+    @ApiOperation(value = "瀹℃牳杈呭姪宸ユ椂")
     @PostMapping("/check")
     public Result check(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay ) {
-        return Result.success(auxiliaryWorkingHoursDayService.updateAuxiliaryWorkingHoursDay(auxiliaryWorkingHoursDay));
+        return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(auxiliaryWorkingHoursDay));
     }
 
     @ValueClassify("宸ユ椂绠＄悊")
-    @ApiOperation(value = "缂栬緫")
+    @ApiOperation(value = "缂栬緫杈呭姪宸ユ椂")
     @PostMapping("/updateAuxiliaryWorkingHoursDay")
     public Result updateAuxiliaryWorkingHoursDay(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
         return Result.success(auxiliaryWorkingHoursDayService.updateAuxiliaryWorkingHoursDay(auxiliaryWorkingHoursDay));
     }
 
     @ValueClassify("宸ユ椂绠＄悊")
-    @ApiOperation(value = "鍒犻櫎")
+    @ApiOperation(value = "鍒犻櫎杈呭姪宸ユ椂")
     @PostMapping("/deleteAuxiliaryWorkingHoursDay")
     public Result deleteAuxiliaryWorkingHoursDay(Integer id) {
         return Result.success(auxiliaryWorkingHoursDayService.deleteAuxiliaryWorkingHoursDay(id));

--
Gitblit v1.9.3