feat: 团队管理-CRUD

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmTeamController.java

@@ -1,6 +1,7 @@
 package com.qunzhixinxi.hnqz.admin.controller;
 
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -139,15 +140,22 @@ public class WmTeamController {
 				.eq(WmTeam::getDeptId, SecurityUtils.getUser().getDeptId())
 				.eq(WmTeam::getDelFlag, DelEnum.NOT_DEL.val()));
 		teamManagePage.getRecords().forEach(wmTeamManage -> {
-			List<SysUser> userList = sysUserMapper.selectBatchIds(CollectionUtil.toList(wmTeamManage.getMember()));
-			wmTeamManage.setMemberName(userList.stream().toArray(String[]::new));
+			if (wmTeamManage.getLeader() != null) {
+				SysUser leaderUser = sysUserMapper.selectById(wmTeamManage.getLeader());
+				wmTeamManage.setLeaderName(leaderUser.getRealname());
+			}
+			if (ArrayUtil.isNotEmpty(wmTeamManage.getMember())) {
+				List<SysUser> userList = sysUserMapper.selectBatchIds(CollectionUtil.toList(wmTeamManage.getMember()));
+				wmTeamManage.setMemberName(userList.stream().map(SysUser::getRealname).toArray(String[]::new));
+			}
 		});
 		return R.ok(teamManagePage);
 	}
 
 	/**
-	 * TODO
-	 * @param teamId
+	 * 查询团队可选择人员
+	 *
+	 * @param teamId 团队id
 	 * @return
 	 */
 	@GetMapping("/list-selectable-user")

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmTeam.java

@@ -1,5 +1,6 @@
 package com.qunzhixinxi.hnqz.admin.entity;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
@@ -45,6 +46,12 @@ public class WmTeam extends Model<WmTeam> {
 	 */
 	private Integer leader;
 
+	/**
+	 * 团队负责人名称
+	 */
+	@TableField(exist = false)
+	private String leaderName;
+
 	/**
 	 * 团队成员
 	 */
@@ -53,6 +60,7 @@ public class WmTeam extends Model<WmTeam> {
 	/**
 	 * 团队成员名称
 	 */
+	@TableField(exist = false)
 	private String[] memberName;
 
 	/**

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/impl/WmTeamServiceImpl.java

@@ -90,6 +90,29 @@ public class WmTeamServiceImpl extends ServiceImpl<WmTeamMapper, WmTeam> impleme
 					userMap.put("userId", sysUser.getUserId());
 					return userMap;
 				}).collect(Collectors.toList());
+		// 已选择的人员（leader+member）
+		if (teamId != null) {
+			WmTeam team = this.getById(teamId);
+			List<String> selectedMemberIds = CollectionUtil.toList(team.getMember());
+			SysUser leaderUser = sysUserMapper.selectById(team.getLeader());
+			Map<String, Object> leaderMap = MapUtil.newHashMap(3);
+			leaderMap.put("realName", leaderUser.getRealname());
+			leaderMap.put("phone", leaderUser.getUsername());
+			leaderMap.put("userId", leaderUser.getUserId());
+			leaderMap.put("isLeader", true);
+			List<SysUser> selectedMemberUsers = sysUserMapper.selectBatchIds(selectedMemberIds);
+			List<Map<String, Object>> selectedMembers = selectedMemberUsers.stream()
+					.map(sysUser -> {
+						Map<String, Object> userMap = MapUtil.newHashMap(3);
+						userMap.put("realName", sysUser.getRealname());
+						userMap.put("phone", sysUser.getUsername());
+						userMap.put("userId", sysUser.getUserId());
+						userMap.put("isLeader", false);
+						return userMap;
+					}).collect(Collectors.toList());
+			selectedMembers.add(0, leaderMap);
+			resultMap.put("selectedMembers", selectedMembers);
+		}
 		resultMap.put("leaders", leaderList);
 		resultMap.put("notAssignedMembers", notAssignedUserList);
 		resultMap.put("assignedMembers", assignedUserList);