From bc263d8bed5d1405f275bb8638a9bec9eaf06585 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 31 三月 2025 09:42:00 +0800
Subject: [PATCH] 添加审签逻辑，移动flow通用代码，添加根据角色查询用户，新增时间工具类，修改指派设备bug
---
lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java | 62 +++++++++++++++++++++++++++++++
1 files changed, 62 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
index 6be0483..ba318e0 100644
--- a/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
+++ b/lxzn-module-system/lxzn-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java
@@ -169,6 +169,68 @@
return result;
}
+ /**
+ * 鑾峰彇鐢ㄦ埛鍒楄〃鏁版嵁
+ * @param user
+ * @param req
+ * @return
+ */
+ @RequestMapping(value = "/listAll", method = RequestMethod.GET)
+ public Result<List<SysUser>> listAll(SysUser user,HttpServletRequest req) {
+ Result<List<SysUser>> result = new Result<List<SysUser>>();
+ QueryWrapper<SysUser> queryWrapper = QueryGenerator.initQueryWrapper(user, req.getParameterMap());
+
+ //update-begin-Author:wangshuai--Date:20211119--for:銆恦ue3銆戦�氳繃閮ㄩ棬id鏌ヨ鐢ㄦ埛锛岄�氳繃code鏌ヨid
+ //閮ㄩ棬ID
+ String departId = req.getParameter("departId");
+ if(oConvertUtils.isNotEmpty(departId)){
+ LambdaQueryWrapper<SysUserDepart> query = new LambdaQueryWrapper<>();
+ query.eq(SysUserDepart::getDepId,departId);
+ List<SysUserDepart> list = sysUserDepartService.list(query);
+ List<String> userIds = list.stream().map(SysUserDepart::getUserId).collect(Collectors.toList());
+ //update-begin---author:wangshuai ---date:20220322 for锛歔issues/I4XTYB]鏌ヨ鐢ㄦ埛鏃讹紝褰撻儴闂╥d 涓嬫病鏈夊垎閰嶇敤鎴锋椂鎺ュ彛鎶ラ敊------------
+ if(oConvertUtils.listIsNotEmpty(userIds)){
+ queryWrapper.in("id",userIds);
+ }else{
+ return Result.OK();
+ }
+ //update-end---author:wangshuai ---date:20220322 for锛歔issues/I4XTYB]鏌ヨ鐢ㄦ埛鏃讹紝褰撻儴闂╥d 涓嬫病鏈夊垎閰嶇敤鎴锋椂鎺ュ彛鎶ラ敊------------
+ }
+ //鐢ㄦ埛ID
+ String code = req.getParameter("code");
+ if(oConvertUtils.isNotEmpty(code)){
+ queryWrapper.in("id",Arrays.asList(code.split(",")));
+ }
+ //update-end-Author:wangshuai--Date:20211119--for:銆恦ue3銆戦�氳繃閮ㄩ棬id鏌ヨ鐢ㄦ埛锛岄�氳繃code鏌ヨid
+
+ //update-begin-author:taoyan--date:20220104--for: JTC-372 銆愮敤鎴峰喕缁撻棶棰樸�� online鎺堟潈銆佺敤鎴风粍浠讹紝閫夋嫨鐢ㄦ埛閮借兘鐪嬪埌琚喕缁撶殑鐢ㄦ埛
+ String status = req.getParameter("status");
+ if(oConvertUtils.isNotEmpty(status)){
+ queryWrapper.eq("status", Integer.parseInt(status));
+ }
+ //update-end-author:taoyan--date:20220104--for: JTC-372 銆愮敤鎴峰喕缁撻棶棰樸�� online鎺堟潈銆佺敤鎴风粍浠讹紝閫夋嫨鐢ㄦ埛閮借兘鐪嬪埌琚喕缁撶殑鐢ㄦ埛
+
+ //TODO 澶栭儴妯℃嫙鐧婚檰涓存椂璐﹀彿锛屽垪琛ㄤ笉鏄剧ず
+ queryWrapper.ne("username","_reserve_user_external");
+ List<SysUser> list = sysUserService.list(queryWrapper);
+ //鎵归噺鏌ヨ鐢ㄦ埛鐨勬墍灞為儴闂�
+ //step.1 鍏堟嬁鍒板叏閮ㄧ殑 useids
+ //step.2 閫氳繃 useids锛屼竴娆℃�ф煡璇㈢敤鎴风殑鎵�灞為儴闂ㄥ悕瀛�
+ List<String> userIds = list.stream().map(SysUser::getId).collect(Collectors.toList());
+ Map<String, String> useProNames = sysUserService.getProNamesByUserIds(userIds);
+ if(userIds!=null && userIds.size()>0){
+ Map<String,String> useDepNames = sysUserService.getDepNamesByUserIds(userIds);
+ list.forEach(item->{
+ item.setOrgCodeTxt(useDepNames.get(item.getId()));
+ item.setProductionName(useProNames.get(item.getId()));
+ });
+ }
+ result.setSuccess(true);
+ result.setResult(list);
+ log.info(list.toString());
+ return result;
+ }
+
//@RequiresRoles({"admin"})
//Permissions("system:user:add")
@RequestMapping(value = "/add", method = RequestMethod.POST)
--
Gitblit v1.9.3