From 66990e9be43f71b89aa42065d696b682d803afa6 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期二, 25 三月 2025 10:07:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 performance-server/src/main/java/com/yuanchu/mom/controller/AuxiliaryWorkingHoursDayController.java |   34 +++++++++++++++++++++++-----------
 1 files changed, 23 insertions(+), 11 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 cb015bb..baf5549 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
@@ -1,7 +1,10 @@
 package com.yuanchu.mom.controller;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yuanchu.mom.annotation.ValueAuth;
 import com.yuanchu.mom.annotation.ValueClassify;
+import com.yuanchu.mom.dto.AuxiliaryWorkingHoursDayDto;
+import com.yuanchu.mom.dto.HoursDay;
 import com.yuanchu.mom.pojo.AuxiliaryWorkingHours;
 import com.yuanchu.mom.pojo.AuxiliaryWorkingHoursDay;
 import com.yuanchu.mom.service.AuxiliaryWorkingHoursDayService;
@@ -10,6 +13,7 @@
 import com.yuanchu.mom.vo.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import jdk.nashorn.internal.ir.annotations.Ignore;
 import lombok.AllArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -18,6 +22,7 @@
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -38,22 +43,22 @@
     private AuxiliaryWorkingHoursDayService auxiliaryWorkingHoursDayService;
 
     @ValueClassify("宸ユ椂绠＄悊")
-    @ApiOperation(value = "鏌ヨ杈呭姪宸ユ椂")
+    @ApiOperation(value = "鏌ヨ宸ユ椂缁熻鐨勮緟鍔╁伐鏃�")
     @PostMapping("/selectAuxiliaryWorkingHoursDay")
     public Result selectAuxiliaryWorkingHoursDay(@RequestBody Map<String, Object> data) throws Exception {
         Page page = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("page")), Page.class);
-        AuxiliaryWorkingHoursDay entity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), AuxiliaryWorkingHoursDay.class);
+        AuxiliaryWorkingHoursDayDto entity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), AuxiliaryWorkingHoursDayDto.class);
         return Result.success(auxiliaryWorkingHoursDayService.selectAuxiliaryWorkingHoursDay(page, entity));
     }
 
-    @ValueClassify("宸ユ椂绠＄悊")
+    @ValueAuth
     @ApiOperation(value = "鏍规嵁缂栧彿鏌ヨ杈呭姪宸ユ椂閰嶇疆淇℃伅")
     @PostMapping("/selectAuxiliaryWorkingHoursByNumber")
     public Result selectAuxiliaryWorkingHoursByNumber(String number) {
         return Result.success(auxiliaryWorkingHoursDayService.selectAuxiliaryWorkingHoursByNumber(number));
     }
 
-    @ValueClassify("宸ユ椂绠＄悊")
+    @ValueAuth
     @ApiOperation(value = "鏍规嵁缂栧彿褰撳墠鐢ㄦ埛淇℃伅鏌ヨ鎵�鍦ㄧ彮娆�")
     @PostMapping("/selectshiftByUser")
     public Result selectshiftByUser(LocalDateTime dateTime) {
@@ -61,28 +66,35 @@
     }
 
     @ValueClassify("宸ユ椂绠＄悊")
-    @ApiOperation(value = "褰曞叆鏁版嵁(鏂板)")
+    @ApiOperation(value = "褰曞叆鏁版嵁(宸ユ椂缁熻鐨勮緟鍔╁伐鏃�)")
     @PostMapping("/insertAuxiliaryWorkingHoursDay")
     public Result insertAuxiliaryWorkingHoursDay(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
         return Result.success(auxiliaryWorkingHoursDayService.insertAuxiliaryWorkingHoursDay(auxiliaryWorkingHoursDay));
     }
 
     @ValueClassify("宸ユ椂绠＄悊")
-    @ApiOperation(value = "瀹℃牳/鎵瑰噯")
-    @PostMapping("/checkOrApprove")
-    public Result checkOrApprove(Integer id, String state) {
-        return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(id,state));
+    @ApiOperation(value = "鎵瑰噯宸ユ椂缁熻鐨勮緟鍔╁伐鏃�")
+    @PostMapping("/approve")
+    public Result approve(@RequestBody  HoursDay hoursDay ) {
+        return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(hoursDay));
     }
 
     @ValueClassify("宸ユ椂绠＄悊")
-    @ApiOperation(value = "缂栬緫")
+    @ApiOperation(value = "瀹℃牳宸ユ椂缁熻鐨勮緟鍔╁伐鏃�")
+    @PostMapping("/check")
+    public Result check(@RequestBody HoursDay hoursDay ) {
+        return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(hoursDay));
+    }
+
+    @ValueClassify("宸ユ椂绠＄悊")
+    @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