feat(approval): 完善审批功能并统一返回数据结构
- 修改IWmsApprovalService接口方法返回类型为Map<String, Object> - 更新WmsApprovalController控制器响应类型以匹配服务层变更 - 在WmsApprovalServiceImpl中实现审批详情查询和创建人昵称转换功能 - 添加批量查询用户昵称优化性能 - 实现请假和外出申请的审批状态管理 - 扩展WmsLeaveRequestVo和WmsOutRequestVo添加创建人姓名字段 - 在请假和外出申请创建时自动生成对应的审批记录
This commit is contained in:
@@ -1,12 +1,15 @@
|
||||
package com.klp.service.impl;
|
||||
|
||||
import cn.hutool.core.bean.BeanUtil;
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import com.klp.common.core.page.TableDataInfo;
|
||||
import com.klp.common.core.domain.PageQuery;
|
||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.klp.common.core.service.UserService;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import com.klp.system.service.ISysUserService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.domain.bo.WmsApprovalBo;
|
||||
@@ -15,9 +18,13 @@ import com.klp.domain.WmsApproval;
|
||||
import com.klp.mapper.WmsApprovalMapper;
|
||||
import com.klp.service.IWmsApprovalService;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Collection;
|
||||
import java.util.*;
|
||||
import java.util.stream.Collectors;
|
||||
|
||||
import com.klp.mapper.WmsLeaveRequestMapper;
|
||||
import com.klp.mapper.WmsOutRequestMapper;
|
||||
import com.klp.domain.vo.WmsLeaveRequestVo;
|
||||
import com.klp.domain.vo.WmsOutRequestVo;
|
||||
|
||||
/**
|
||||
* 通用审批（支持请假/外出等申请的审批）Service业务层处理
|
||||
@@ -30,25 +37,137 @@ import java.util.Collection;
|
||||
public class WmsApprovalServiceImpl implements IWmsApprovalService {
|
||||
|
||||
private final WmsApprovalMapper baseMapper;
|
||||
private final WmsLeaveRequestMapper leaveRequestMapper;
|
||||
private final WmsOutRequestMapper outRequestMapper;
|
||||
private final ISysUserService userService;
|
||||
|
||||
/**
|
||||
* 查询通用审批（支持请假/外出等申请的审批）
|
||||
*/
|
||||
@Override
|
||||
public WmsApprovalVo queryById(Long approvalId){
|
||||
return baseMapper.selectVoById(approvalId);
|
||||
public Map<String, Object> queryById(Long approvalId){
|
||||
Map<String, Object> result = new HashMap<>();
|
||||
WmsApprovalVo approval = baseMapper.selectVoById(approvalId);
|
||||
if (approval == null) {
|
||||
return result;
|
||||
}
|
||||
result.put("approval", approval);
|
||||
String type = approval.getApplyType();
|
||||
Long applyId = approval.getApplyId();
|
||||
if (StringUtils.isNotBlank(type) && applyId != null) {
|
||||
if ("leave".equalsIgnoreCase(type)) {
|
||||
WmsLeaveRequestVo detail = leaveRequestMapper.selectVoById(applyId);
|
||||
// 详情接口也可以补充昵称转换（可选）
|
||||
if (detail != null && StringUtils.isNotBlank(detail.getCreateBy())) {
|
||||
Map<String, String> nickMap = userService.selectNickNameMapByUserNames(Collections.singletonList(detail.getCreateBy()));
|
||||
detail.setCreateByName(nickMap.getOrDefault(detail.getCreateBy(), detail.getCreateBy()));
|
||||
}
|
||||
result.put("detail", detail);
|
||||
result.put("applyType", "leave");
|
||||
} else if ("out".equalsIgnoreCase(type)) {
|
||||
WmsOutRequestVo outDetail = outRequestMapper.selectVoById(applyId);
|
||||
// 详情接口也可以补充昵称转换（可选）
|
||||
if (outDetail != null && StringUtils.isNotBlank(outDetail.getCreateBy())) {
|
||||
Map<String, String> nickMap = userService.selectNickNameMapByUserNames(Collections.singletonList(outDetail.getCreateBy()));
|
||||
outDetail.setCreateByName(nickMap.getOrDefault(outDetail.getCreateBy(), outDetail.getCreateBy()));
|
||||
}
|
||||
result.put("detail", outDetail);
|
||||
result.put("applyType", "out");
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
/**
|
||||
* 查询通用审批（支持请假/外出等申请的审批）列表
|
||||
* 查询通用审批列表（含请假/外出详情+创建人昵称转换）
|
||||
*/
|
||||
@Override
|
||||
public TableDataInfo<WmsApprovalVo> queryPageList(WmsApprovalBo bo, PageQuery pageQuery) {
|
||||
public TableDataInfo<Map<String, Object>> queryPageList(WmsApprovalBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsApproval> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsApprovalVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
return TableDataInfo.build(result);
|
||||
// 1. 查询审批列表分页数据
|
||||
Page<WmsApprovalVo> approvalPage = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
List<WmsApprovalVo> approvalList = approvalPage.getRecords();
|
||||
|
||||
if (CollectionUtil.isEmpty(approvalList)) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// 2. 处理审批列表，拼接请假/外出详情，并收集所有需要转换的创建人账号
|
||||
List<Map<String, Object>> resultList = new ArrayList<>();
|
||||
Set<String> userNames = new HashSet<>(); // 存储所有需要查询昵称的账号
|
||||
|
||||
for (WmsApprovalVo approval : approvalList) {
|
||||
Map<String, Object> item = new HashMap<>();
|
||||
item.put("approval", approval); // 审批基础信息
|
||||
|
||||
String applyType = approval.getApplyType();
|
||||
Long applyId = approval.getApplyId();
|
||||
Object detail = null;
|
||||
|
||||
// 3. 查询请假/外出详情，并收集创建人账号
|
||||
if (StringUtils.isNotBlank(applyType) && applyId != null) {
|
||||
if ("leave".equalsIgnoreCase(applyType)) {
|
||||
WmsLeaveRequestVo leaveDetail = leaveRequestMapper.selectVoById(applyId);
|
||||
detail = leaveDetail;
|
||||
// 收集请假申请的创建人账号
|
||||
if (leaveDetail != null && StringUtils.isNotBlank(leaveDetail.getCreateBy())) {
|
||||
userNames.add(leaveDetail.getCreateBy());
|
||||
}
|
||||
item.put("applyType", "leave");
|
||||
} else if ("out".equalsIgnoreCase(applyType)) {
|
||||
WmsOutRequestVo outDetail = outRequestMapper.selectVoById(applyId);
|
||||
detail = outDetail;
|
||||
// 收集外出申请的创建人账号
|
||||
if (outDetail != null && StringUtils.isNotBlank(outDetail.getCreateBy())) {
|
||||
userNames.add(outDetail.getCreateBy());
|
||||
}
|
||||
item.put("applyType", "out");
|
||||
}
|
||||
item.put("detail", detail);
|
||||
}
|
||||
resultList.add(item);
|
||||
}
|
||||
|
||||
// 4. 批量查询昵称映射
|
||||
Map<String, String> nickMap = Collections.emptyMap();
|
||||
if (!userNames.isEmpty()) {
|
||||
nickMap = userService.selectNickNameMapByUserNames(new ArrayList<>(userNames));
|
||||
}
|
||||
|
||||
// 5. 遍历填充请假/外出申请的创建人昵称
|
||||
for (Map<String, Object> item : resultList) {
|
||||
Object detail = item.get("detail");
|
||||
if (detail == null || nickMap.isEmpty()) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// 区分请假/外出类型，填充创建人昵称
|
||||
if ("leave".equals(item.get("applyType"))) {
|
||||
WmsLeaveRequestVo leaveDetail = (WmsLeaveRequestVo) detail;
|
||||
if (StringUtils.isNotBlank(leaveDetail.getCreateBy())) {
|
||||
// 填充创建人昵称
|
||||
leaveDetail.setCreateByName(nickMap.getOrDefault(leaveDetail.getCreateBy(), leaveDetail.getCreateBy()));
|
||||
}
|
||||
} else if ("out".equals(item.get("applyType"))) {
|
||||
WmsOutRequestVo outDetail = (WmsOutRequestVo) detail;
|
||||
if (StringUtils.isNotBlank(outDetail.getCreateBy())) {
|
||||
outDetail.setCreateByName(nickMap.getOrDefault(outDetail.getCreateBy(), outDetail.getCreateBy()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 6. 构建分页返回结果
|
||||
Page<Map<String, Object>> resultPage = new Page<>();
|
||||
resultPage.setRecords(resultList);
|
||||
resultPage.setTotal(approvalPage.getTotal());
|
||||
resultPage.setSize(approvalPage.getSize());
|
||||
resultPage.setCurrent(approvalPage.getCurrent());
|
||||
resultPage.setPages(approvalPage.getPages());
|
||||
|
||||
return TableDataInfo.build(resultPage);
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* 查询通用审批（支持请假/外出等申请的审批）列表
|
||||
*/
|
||||
@@ -111,4 +230,5 @@ public class WmsApprovalServiceImpl implements IWmsApprovalService {
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user