From 6c56f35bef519265b4e7ae98fda6ca87855daf9f Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期四, 15 十二月 2022 11:29:08 +0800
Subject: [PATCH] Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server
---
ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java | 40 +++++++++++++++++++++++++++++++++++++++-
1 files changed, 39 insertions(+), 1 deletions(-)
diff --git a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
index e3d63c6..2d9f68f 100644
--- a/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
+++ b/ycl-common/src/main/java/com/ycl/controller/depart/DepartController.java
@@ -83,6 +83,16 @@
return CommonResult.success(departService.removeBatchByIds(ids));
}
+ @ApiOperation("鎵瑰鐞�-寮�鍚垨鑰呯鐢ㄩ儴闂�")
+ @PutMapping(value = "/batch_status")
+ @LogSave(operationType = "閮ㄩ棬绠＄悊", contain = "鎵归噺寮�鍚垨鑰呯鐢ㄩ儴闂�")
+ public CommonResult updateBatch(@RequestBody List<UmsDepart> umsDepartList) {
+ if (umsDepartList.isEmpty()) {
+ return CommonResult.failed("bad request parameter");
+ }
+ return CommonResult.success(departService.updateBatchById(umsDepartList));
+ }
+
@ApiOperation("璇︽儏")
@PostMapping(value = "/detail")
@LogSave(operationType = "閮ㄩ棬绠＄悊", contain = "鏌ョ湅閮ㄩ棬")
@@ -108,7 +118,7 @@
@ApiOperation("鏌ヨ鍏ㄩ儴閮ㄩ棬")
@GetMapping(value = "/page")
public CommonResult<IPage<UmsDepartVO>> page(@RequestParam("currentPage") Integer currentPage, @RequestParam("pageSize") Integer pageSize,
- @RequestParam(value = "departName", required = false) String departName) {
+ @RequestParam(value = "departName", required = false) String departName) {
IPage<UmsDepartVO> page = new Page<>(currentPage, pageSize);
departService.pageDepart(departName, page);
return CommonResult.success(page);
@@ -121,6 +131,34 @@
return CommonResult.success(basePageDTO);
}
+ @ApiOperation("鐢ㄦ埛淇敼瑙掕壊")
+ @PutMapping(value = "/user_update_Role")
+ public CommonResult userUpdateRole(@RequestParam Long id,
+ @RequestParam List<Long> roles) {
+ umsAdminDepartService.userUpdateRoles(id, roles);
+ return CommonResult.success("update success");
+ }
+
+ @ApiOperation("鐢ㄦ埛淇敼閮ㄩ棬")
+ @PutMapping(value = "/user_update_depart")
+ public CommonResult userUpdateDepart(@RequestParam Long userId,
+ @RequestParam Long departId) {
+ umsAdminDepartService.userUpdateDepart(userId, departId);
+ return CommonResult.success("update success");
+ }
+
+ @ApiOperation("鏌ヨ涓嶅湪閮ㄩ棬鐨勫墿浣欎汉鍛�")
+ @GetMapping("/query_surplus_user")
+ public CommonResult searchSurplusUser() {
+ return CommonResult.success(departService.selectSurplusUser());
+ }
+
+ @ApiOperation("鏌ヨ涓嶅湪閮ㄩ棬鐨勫墿浣欎汉鍛樺拰宸插湪閮ㄩ棬鐨勪汉")
+ @GetMapping("/query_surplus_exist_user")
+ public CommonResult searchSurplusUser(@RequestParam Long id) {
+ return CommonResult.success(departService.selectSurplusUserAndExistUser(id));
+ }
+
@ApiOperation("鏌ヨ椤剁骇閮ㄩ棬")
@GetMapping(value = "/query_father")
public CommonResult search() {
--
Gitblit v1.8.0