feat(hrm): 添加流程实例评论功能
- 新增 HrmFlowComment 实体类定义评论数据结构 - 创建 HrmFlowCommentBo 业务对象用于数据传输 - 实现 HrmFlowCommentController 提供完整的CRUD接口 - 开发 HrmFlowCommentService 业务逻辑处理层 - 配置 HrmFlowCommentMapper 数据访问接口 - 设计 HrmFlowCommentVo 视图对象支持Excel导出 - 在SysUserService中添加用户昵称映射查询方法 - 实现评论列表的分页查询和用户名称转换功能 - 支持评论内容和附件信息的存储与展示
This commit is contained in:
@@ -6,6 +6,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
|
||||
|
||||
import java.util.Date;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
/**
|
||||
* 用户 业务层
|
||||
@@ -241,4 +242,7 @@ public interface ISysUserService {
|
||||
List<SysUser> selectUserList2();
|
||||
|
||||
SysUser selectUserByIdIncludingDel(Long userId);
|
||||
|
||||
|
||||
Map<String, String> selectNickNameMapByUserNames(List<String> userNames);
|
||||
}
|
||||
|
||||
@@ -33,10 +33,8 @@ import org.springframework.cache.annotation.Cacheable;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
/**
|
||||
* 用户 业务层处理
|
||||
@@ -531,4 +529,29 @@ public class SysUserServiceImpl implements ISysUserService, UserService {
|
||||
return baseMapper.selectUserByNickName(nickName);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Map<String, String> selectNickNameMapByUserNames(List<String> userNames) {
|
||||
if (CollUtil.isEmpty(userNames)) {
|
||||
return new HashMap<>();
|
||||
}
|
||||
|
||||
// 先查询数据库中存在的用户
|
||||
List<SysUser> users = baseMapper.selectList(new LambdaQueryWrapper<SysUser>()
|
||||
.select(SysUser::getUserName, SysUser::getNickName)
|
||||
.in(SysUser::getUserName, userNames)
|
||||
.eq(SysUser::getDelFlag, UserConstants.USER_NORMAL));
|
||||
|
||||
// 创建一个映射,包含存在的用户昵称
|
||||
Map<String, String> nickMap = users.stream()
|
||||
.collect(Collectors.toMap(SysUser::getUserName, SysUser::getNickName, (a, b) -> a));
|
||||
|
||||
// 对于不存在的用户名,将其用户名作为昵称添加到映射中
|
||||
for (String userName : userNames) {
|
||||
if (!nickMap.containsKey(userName)) {
|
||||
nickMap.put(userName, userName);
|
||||
}
|
||||
}
|
||||
|
||||
return nickMap;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user