From 52d79c7e5a1fb4316f34886ec336f69f56d5edb2 Mon Sep 17 00:00:00 2001
From: lxp <1928192722@qq.com>
Date: 星期六, 15 三月 2025 10:48:46 +0800
Subject: [PATCH] 工时管理日工时管理以及辅助工时配置
---
performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java b/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java
index ecdabdb..04d1c08 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/controller/PerformanceShiftController.java
@@ -15,6 +15,7 @@
import com.ruoyi.system.service.UserService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
+import org.apache.ibatis.annotations.Param;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -63,13 +64,13 @@
}
@ApiOperation(value = "鏈堜唤鍒嗛〉鏌ヨ")
- @PostMapping("page")
- public Result<?> performanceShiftPage(Integer size, Integer current, String time, String userName, String laboratory) {
+ @GetMapping("page")
+ public Result<?> performanceShiftPage(@Param("size") Integer size,@Param("current") Integer current,@Param("time") String time,@Param("userName") String userName,@Param("laboratory") String laboratory) {
return Result.success(performanceShiftService.performanceShiftPage(new Page<>(current, size), time, userName, laboratory));
}
@ApiOperation(value = "骞翠唤鍒嗛〉鏌ヨ")
- @PostMapping("pageYear")
+ @GetMapping("pageYear")
public Result<?> performanceShiftPageYear(Integer size, Integer current, String time, String userName, String laboratory) {
return Result.success(performanceShiftService.performanceShiftPageYear(new Page<>(current, size), time, userName, laboratory));
}
@@ -111,11 +112,19 @@
}
}
+ @ApiOperation("鐝:鏌ヨ浜哄憳鍒楄〃")
+ @GetMapping("/getUserList")
+ public Result<?> getUserList(){
+ Map<String, List<Map<String, Object>>> userList = performanceShiftService.getUserList();
+ return Result.success(userList);
+ }
+
+
@ApiOperation(value = "涓存椂鎺ュ彛-娣诲姞7鏈堜唤8鏈堜唤鐨勬暟鎹�")
@GetMapping("temporaryInterface")
public void temporaryInterface() {
System.out.println("寮�濮嬬粰姣忎釜浜鸿繘琛屾帓鐝�,榛樿鏃╃彮======start");
- // TODO 缁欐瘡涓汉閮借繘琛屾帓鐝�(榛樿鏃╃彮)
+ // 缁欐瘡涓汉閮借繘琛屾帓鐝�(榛樿鏃╃彮)
PerformanceShiftAddDto performanceShiftAddDto = new PerformanceShiftAddDto();
//鐝--鏃�(鏌ヨ瀛楀吀)
List<SysDictData> shiftType = dictTypeService.selectDictDataByName("鐝绫诲瀷");
--
Gitblit v1.9.3