From 5f30ef778bbdf59d2835ddbf86d2edc6c6e279b5 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 25 三月 2025 15:20:43 +0800
Subject: [PATCH] 获取两个时间内，除去周末周日以及法定节假日的 小时总数。
---
start/src/main/java/com/ycl/web/controller/system/SysUserController.java | 29 +++++++++++++++++++++++++++--
1 files changed, 27 insertions(+), 2 deletions(-)
diff --git a/start/src/main/java/com/ycl/web/controller/system/SysUserController.java b/start/src/main/java/com/ycl/web/controller/system/SysUserController.java
index 98c0d3c..f6580d6 100644
--- a/start/src/main/java/com/ycl/web/controller/system/SysUserController.java
+++ b/start/src/main/java/com/ycl/web/controller/system/SysUserController.java
@@ -55,11 +55,22 @@
/**
* 鑾峰彇鐢ㄦ埛鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:user:list')")
+// @PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/list")
public TableDataInfo list(SysUser user) {
startPage();
List<SysUser> list = userService.selectUserList(user);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鑾峰彇鐢ㄦ埛鍒楄〃 鏃犳暟鎹潈闄�
+ */
+// @PreAuthorize("@ss.hasPermi('system:user:list')")
+ @GetMapping("/list/no-data-auth")
+ public TableDataInfo listNoAuth(SysUser user) {
+ startPage();
+ List<SysUser> list = userService.selectUserListNoAuth(user);
return getDataTable(list);
}
@@ -217,10 +228,19 @@
/**
* 鑾峰彇閮ㄩ棬鏍戝垪琛�
*/
- @PreAuthorize("@ss.hasPermi('system:user:list')")
+// @PreAuthorize("@ss.hasPermi('system:user:list')")
@GetMapping("/deptTree")
public AjaxResult deptTree(SysDept dept) {
return success(deptService.selectDeptTreeList(dept));
+ }
+
+ /**
+ * 鑾峰彇閮ㄩ棬鏍戝垪琛� 鏃犳暟鎹潈闄�
+ */
+// @PreAuthorize("@ss.hasPermi('system:user:list')")
+ @GetMapping("/deptTree/no-data-auth")
+ public AjaxResult deptTreeNoDataAuth(SysDept dept) {
+ return success(deptService.deptTreeNoDataAuth(dept));
}
/**
@@ -231,4 +251,9 @@
public AjaxResult flowDeptTree(SysDept dept) {
return success(deptService.flowDeptTree(dept));
}
+
+ @GetMapping("/getByDept/{deptId}")
+ public AjaxResult getByDept(@PathVariable Long deptId) {
+ return success(userService.getByDept(deptId));
+ }
}
--
Gitblit v1.8.0