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 | 5 +++--
1 files changed, 3 insertions(+), 2 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 e7b2064..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
@@ -115,7 +115,8 @@
@ApiOperation("鐝:鏌ヨ浜哄憳鍒楄〃")
@GetMapping("/getUserList")
public Result<?> getUserList(){
- return Result.success(performanceShiftService.getUserList());
+ Map<String, List<Map<String, Object>>> userList = performanceShiftService.getUserList();
+ return Result.success(userList);
}
@@ -123,7 +124,7 @@
@GetMapping("temporaryInterface")
public void temporaryInterface() {
System.out.println("寮�濮嬬粰姣忎釜浜鸿繘琛屾帓鐝�,榛樿鏃╃彮======start");
- // TODO 缁欐瘡涓汉閮借繘琛屾帓鐝�(榛樿鏃╃彮)
+ // 缁欐瘡涓汉閮借繘琛屾帓鐝�(榛樿鏃╃彮)
PerformanceShiftAddDto performanceShiftAddDto = new PerformanceShiftAddDto();
//鐝--鏃�(鏌ヨ瀛楀吀)
List<SysDictData> shiftType = dictTypeService.selectDictDataByName("鐝绫诲瀷");
--
Gitblit v1.9.3