From 3647aa5008055528f075ee73002542a1399575ae Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 19 三月 2025 14:45:39 +0800
Subject: [PATCH] 单点登录调整

---
 performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryWorkingHoursDayController.java |   41 +++++++++++++----------------------------
 1 files changed, 13 insertions(+), 28 deletions(-)

diff --git a/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryWorkingHoursDayController.java b/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryWorkingHoursDayController.java
index 97b0a81..5dee83f 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryWorkingHoursDayController.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/controller/AuxiliaryWorkingHoursDayController.java
@@ -1,5 +1,6 @@
 package com.ruoyi.performance.controller;
 
+import com.alibaba.fastjson2.JSONObject;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ruoyi.common.core.domain.Result;
 import com.ruoyi.common.utils.JackSonUtil;
@@ -10,15 +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.time.LocalDateTime;
+
 import java.util.Map;
 
 /**
@@ -38,64 +35,52 @@
     @Resource
     private AuxiliaryWorkingHoursDayService auxiliaryWorkingHoursDayService;
 
-    @ApiOperation(value = "鏌ヨ宸ユ椂缁熻鐨勮緟鍔╁伐鏃�")
-    @PostMapping("/selectAuxiliaryWorkingHoursDay")
-    public Result selectAuxiliaryWorkingHoursDay(Page page,AuxiliaryWorkingHoursDayDto entity) throws Exception {
+    @ApiOperation(value = "鏃ュ伐鏃剁鐞�-鏌ョ湅杈呭姪宸ユ椂鍒楄〃")
+    @GetMapping("/selectAuxiliaryWorkingHoursDay")
+    public Result selectAuxiliaryWorkingHoursDay(Page page , AuxiliaryWorkingHoursDayDto entity) throws Exception {
         return Result.success(auxiliaryWorkingHoursDayService.selectAuxiliaryWorkingHoursDay(page, entity));
     }
 
     @ApiOperation(value = "鏍规嵁缂栧彿鏌ヨ杈呭姪宸ユ椂閰嶇疆淇℃伅")
-    @PostMapping("/selectAuxiliaryWorkingHoursByNumber")
+    @GetMapping("/selectAuxiliaryWorkingHoursByNumber")
     public Result selectAuxiliaryWorkingHoursByNumber(String number) {
         return Result.success(auxiliaryWorkingHoursDayService.selectAuxiliaryWorkingHoursByNumber(number));
     }
 
     @ApiOperation(value = "鏍规嵁缂栧彿褰撳墠鐢ㄦ埛淇℃伅鏌ヨ鎵�鍦ㄧ彮娆�")
-    @PostMapping("/selectshiftByUser")
+    @GetMapping("/selectshiftByUser")
     public Result selectshiftByUser(LocalDateTime dateTime) {
         return Result.success(auxiliaryWorkingHoursDayService.selectshiftByUser(dateTime));
     }
 
-    @ApiOperation(value = "褰曞叆鏁版嵁(宸ユ椂缁熻鐨勮緟鍔╁伐鏃�)")
+    @ApiOperation(value = "鏃ュ伐鏃剁鐞�-褰曞叆杈呭姪宸ユ椂")
     @PostMapping("/insertAuxiliaryWorkingHoursDay")
     public Result insertAuxiliaryWorkingHoursDay(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
         return Result.success(auxiliaryWorkingHoursDayService.insertAuxiliaryWorkingHoursDay(auxiliaryWorkingHoursDay));
     }
 
-    @ApiOperation(value = "鎵瑰噯宸ユ椂缁熻鐨勮緟鍔╁伐鏃�")
+    @ApiOperation(value = "鏃ュ伐鏃剁鐞�-鎵瑰噯杈呭姪宸ユ椂")
     @PostMapping("/approve")
     public Result approve(@RequestBody HoursDay hoursDay ) {
         return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(hoursDay));
     }
 
-    @ApiOperation(value = "瀹℃牳宸ユ椂缁熻鐨勮緟鍔╁伐鏃�")
+    @ApiOperation(value = "鏃ュ伐鏃剁鐞�-瀹℃牳杈呭姪宸ユ椂")
     @PostMapping("/check")
     public Result check(@RequestBody HoursDay hoursDay ) {
         return Result.success(auxiliaryWorkingHoursDayService.checkOrApprove(hoursDay));
     }
 
-    @ApiOperation(value = "缂栬緫宸ユ椂缁熻鐨勮緟鍔╁伐鏃�")
+    @ApiOperation(value = "鏃ュ伐鏃剁鐞�-缂栬緫杈呭姪宸ユ椂")
     @PostMapping("/updateAuxiliaryWorkingHoursDay")
     public Result updateAuxiliaryWorkingHoursDay(@RequestBody AuxiliaryWorkingHoursDay auxiliaryWorkingHoursDay) {
         return Result.success(auxiliaryWorkingHoursDayService.updateAuxiliaryWorkingHoursDay(auxiliaryWorkingHoursDay));
     }
 
-    @ApiOperation(value = "鍒犻櫎宸ユ椂缁熻鐨勮緟鍔╁伐鏃�")
+    @ApiOperation(value = "鏃ュ伐鏃剁鐞�-鍒犻櫎杈呭姪宸ユ椂")
     @PostMapping("/deleteAuxiliaryWorkingHoursDay")
     public Result deleteAuxiliaryWorkingHoursDay(Integer id) {
         return Result.success(auxiliaryWorkingHoursDayService.deleteAuxiliaryWorkingHoursDay(id));
-    }
-
-    /**
-     * 瀵煎嚭杈呭姪宸ユ椂
-     * @param response
-     * @throws IOException
-     */
-    @ApiOperation(value = "瀵煎嚭杈呭姪宸ユ椂")
-    @PostMapping("/exportAssistantHours")
-    public void exportAssistantHours(@RequestBody Map<String, Object> data, HttpServletResponse response) throws Exception {
-        AuxiliaryWorkingHoursDayDto entity = JackSonUtil.unmarshal(JackSonUtil.marshal(data.get("entity")), AuxiliaryWorkingHoursDayDto.class);
-        auxiliaryWorkingHoursDayService.exportWorkingHours(entity, response);
     }
 
 }

--
Gitblit v1.9.3