DeXun/klp-oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(wms): 增加多级审批功能和审批任务管理

Browse Source 
- 在WmsApproval实体类中增加审批类型、需要审批人数、已审批人数、最终状态字段
- 实现审批任务通过和驳回功能，支持单人和多级审批流程
- 创建WmsApprovalTask相关实体类、业务对象、数据访问层和控制器
- 集成部门领导查询机制，实现多级审批链路构建
- 更新审批控制器，添加审批任务相关的API接口
- 优化审批列表查询，集成审批任务信息展示
- 配置MyBatis映射文件，支持新的审批任务数据表结构
This commit is contained in:
Joshi
2026-03-02 11:06:09 +08:00
parent a185a42764
commit 81e98ab751
15 changed files with 850 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

259
klp-wms/src/main/java/com/klp/service/impl/WmsApprovalServiceImpl.java
View File

@@ -2,22 +2,35 @@ 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.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.klp.common.core.domain.model.LoginUser;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.klp.common.core.domain.entity.SysDept;
import com.klp.common.core.domain.entity.SysUser;
import com.klp.common.core.service.UserService;
import com.klp.common.helper.LoginHelper;
import com.klp.common.utils.StringUtils;
import com.klp.domain.WmsApprovalTask;
import com.klp.system.mapper.SysDeptMapper;
import com.klp.system.mapper.SysUserMapper;
import com.klp.system.service.ISysUserService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.klp.domain.bo.WmsApprovalBo;
import com.klp.domain.vo.WmsApprovalVo;
import com.klp.domain.WmsApproval;
import com.klp.domain.bo.WmsApprovalTaskBo;
import com.klp.domain.vo.WmsApprovalTaskVo;
import com.klp.mapper.WmsApprovalMapper;
import com.klp.mapper.WmsApprovalTaskMapper;
import com.klp.service.IWmsApprovalService;
import com.klp.service.IWmsApprovalTaskService;
import java.math.BigDecimal;
import java.util.*;
import java.util.stream.Collectors;
@@ -25,6 +38,7 @@ import com.klp.mapper.WmsLeaveRequestMapper;
import com.klp.mapper.WmsOutRequestMapper;
import com.klp.domain.vo.WmsLeaveRequestVo;
import com.klp.domain.vo.WmsOutRequestVo;
import com.klp.domain.WmsLeaveRequest;
/**
* 通用审批（支持请假/外出等申请的审批）Service业务层处理
@@ -37,9 +51,12 @@ import com.klp.domain.vo.WmsOutRequestVo;
public class WmsApprovalServiceImpl implements IWmsApprovalService {
private final WmsApprovalMapper baseMapper;
private final WmsApprovalTaskMapper approvalTaskMapper;
private final WmsLeaveRequestMapper leaveRequestMapper;
private final WmsOutRequestMapper outRequestMapper;
private final ISysUserService userService;
private final SysDeptMapper deptMapper;
private final SysUserMapper userMapper;
/**
* 查询通用审批（支持请假/外出等申请的审批）
@@ -79,7 +96,7 @@ public class WmsApprovalServiceImpl implements IWmsApprovalService {
}
/**
* 查询通用审批列表（含请假/外出详情+创建人昵称转换）
* 查询通用审批列表（含请假/外出详情+创建人昵称转换+审批任务）
*/
@Override
public TableDataInfo<Map<String, Object>> queryPageList(WmsApprovalBo bo, PageQuery pageQuery) {
@@ -99,7 +116,23 @@ public class WmsApprovalServiceImpl implements IWmsApprovalService {
return TableDataInfo.build(emptyResultPage);
}
// 2. 处理审批列表，拼接请假/外出详情，并收集所有需要转换的创建人账号
// 2. 收集所有审批ID，用于查询审批任务
List<Long> approvalIds = approvalList.stream()
.map(WmsApprovalVo::getApprovalId)
.collect(Collectors.toList());
// 2.1 批量查询所有审批任务
List<WmsApprovalTaskVo> allTasks = approvalTaskMapper.selectVoList(
Wrappers.<com.klp.domain.WmsApprovalTask>lambdaQuery()
.in(com.klp.domain.WmsApprovalTask::getApprovalId, approvalIds)
.orderByAsc(com.klp.domain.WmsApprovalTask::getCreateTime)
);
// 2.2 按审批ID分组任务
Map<Long, List<WmsApprovalTaskVo>> tasksMap = allTasks.stream()
.collect(Collectors.groupingBy(WmsApprovalTaskVo::getApprovalId));
// 3. 处理审批列表，拼接请假/外出详情，并收集所有需要转换的创建人账号
List<Map<String, Object>> resultList = new ArrayList<>();
Set<String> userNames = new HashSet<>(); // 存储所有需要查询昵称的账号
@@ -107,11 +140,15 @@ public class WmsApprovalServiceImpl implements IWmsApprovalService {
Map<String, Object> item = new HashMap<>();
item.put("approval", approval); // 审批基础信息
// 3.1 添加审批任务列表
List<WmsApprovalTaskVo> tasks = tasksMap.getOrDefault(approval.getApprovalId(), new ArrayList<>());
item.put("tasks", tasks);
String applyType = approval.getApplyType();
Long applyId = approval.getApplyId();
Object detail = null;
// 3. 查询请假/外出详情，并收集创建人账号
// 4. 查询请假/外出详情，并收集创建人账号
if (StringUtils.isNotBlank(applyType) && applyId != null) {
if ("leave".equalsIgnoreCase(applyType)) {
WmsLeaveRequestVo leaveDetail = leaveRequestMapper.selectVoById(applyId);
@@ -135,13 +172,13 @@ public class WmsApprovalServiceImpl implements IWmsApprovalService {
resultList.add(item);
}
// 4. 批量查询昵称映射
// 5. 批量查询昵称映射
Map<String, String> nickMap = Collections.emptyMap();
if (!userNames.isEmpty()) {
nickMap = userService.selectNickNameMapByUserNames(new ArrayList<>(userNames));
}
// 5. 遍历填充请假/外出申请的创建人昵称
// 6. 遍历填充请假/外出申请的创建人昵称
for (Map<String, Object> item : resultList) {
Object detail = item.get("detail");
if (detail == null || nickMap.isEmpty()) {
@@ -163,7 +200,7 @@ public class WmsApprovalServiceImpl implements IWmsApprovalService {
}
}
// 6. 构建分页返回结果
// 7. 构建分页返回结果
Page<Map<String, Object>> resultPage = new Page<>();
resultPage.setRecords(resultList);
resultPage.setTotal(approvalPage.getTotal());
@@ -193,6 +230,8 @@ public class WmsApprovalServiceImpl implements IWmsApprovalService {
lqw.eq(StringUtils.isNotBlank(bo.getApprovalStatus()), WmsApproval::getApprovalStatus, bo.getApprovalStatus());
lqw.eq(StringUtils.isNotBlank(bo.getApprovalOpinion()), WmsApproval::getApprovalOpinion, bo.getApprovalOpinion());
lqw.eq(bo.getApprovalTime() != null, WmsApproval::getApprovalTime, bo.getApprovalTime());
// 根据创建时间倒叙
lqw.orderByDesc(WmsApproval::getCreateTime);
return lqw;
}
@@ -200,16 +239,142 @@ public class WmsApprovalServiceImpl implements IWmsApprovalService {
* 新增通用审批（支持请假/外出等申请的审批）
*/
@Override
@Transactional(rollbackFor = Exception.class)
public Boolean insertByBo(WmsApprovalBo bo) {
WmsApproval add = BeanUtil.toBean(bo, WmsApproval.class);
validEntityBeforeSave(add);
if (add.getApprovalType() == null) {
add.setApprovalType("single");
}
if (add.getRequiredApprovers() == null) {
add.setRequiredApprovers(0);
}
if (add.getCurrentApprovers() == null) {
add.setCurrentApprovers(0);
}
if (add.getFinalStatus() == null) {
add.setFinalStatus("pending");
}
boolean flag = baseMapper.insert(add) > 0;
if (flag) {
bo.setApprovalId(add.getApprovalId());
if ("leave".equals(add.getApplyType()) && add.getApplyId() != null) {
createApprovalTasks(add.getApprovalId(), add.getApplyId(), add.getApplyType(),add.getApprovalType());
}
}
return flag;
}
private void createApprovalTasks(Long approvalId, Long applyId, String applyType, String approvalType) {
if (!"leave".equals(applyType)) {
return;
}
WmsLeaveRequest leaveRequest = leaveRequestMapper.selectById(applyId);
if (leaveRequest == null) {
return;
}
boolean isMultiLevel = approvalType.equals("multi");
WmsApproval updateApproval = new WmsApproval();
updateApproval.setApprovalId(approvalId);
updateApproval.setApprovalType(approvalType);
if (isMultiLevel) {
List<Long> leaderUserIds = getDeptLeaders(leaveRequest.getApplicantDeptName());
updateApproval.setRequiredApprovers(leaderUserIds.size());
for (Long leaderUserId : leaderUserIds) {
SysUser leaderUser = userMapper.selectById(leaderUserId);
if (leaderUser != null) {
WmsApprovalTaskBo taskBo = new WmsApprovalTaskBo();
taskBo.setApprovalId(approvalId);
taskBo.setApproverId(leaderUserId);
taskBo.setApproverName(leaderUser.getNickName());
taskBo.setTaskStatus("pending");
approvalTaskMapper.insert(BeanUtil.toBean(taskBo, WmsApprovalTask.class));
}
}
} else {
updateApproval.setRequiredApprovers(1);
LoginUser currentUser = LoginHelper.getLoginUser();
if (currentUser != null) {
WmsApprovalTaskBo taskBo = new WmsApprovalTaskBo();
taskBo.setApprovalId(approvalId);
taskBo.setApproverId(LoginHelper.getUserId());
taskBo.setApproverName(LoginHelper.getNickName());
taskBo.setTaskStatus("pending");
approvalTaskMapper.insert(BeanUtil.toBean(taskBo, WmsApprovalTask.class));
}
}
baseMapper.updateById(updateApproval);
}
private List<Long> getDeptLeaders(String applicantDeptName) {
List<Long> leaderUserIds = new ArrayList<>();
if (StringUtils.isBlank(applicantDeptName)) {
return leaderUserIds;
}
// 根据部门名称查询部门信息
SysDept dept = deptMapper.selectOne(new LambdaQueryWrapper<SysDept>()
.eq(SysDept::getDeptName, applicantDeptName));
if (dept == null) {
return leaderUserIds;
}
// 获取部门的所有祖先部门ID（包括自己）
List<Long> ancestorDeptIds = new ArrayList<>();
Long currentDeptId = dept.getDeptId();
while (currentDeptId != null) {
ancestorDeptIds.add(currentDeptId);
SysDept currentDept = deptMapper.selectById(currentDeptId);
if (currentDept != null) {
currentDeptId = currentDept.getParentId();
} else {
break;
}
}
// 查询每个祖先部门的leader字段内容
if (!ancestorDeptIds.isEmpty()) {
List<SysDept> ancestorDepts = deptMapper.selectList(new LambdaQueryWrapper<SysDept>()
.in(SysDept::getDeptId, ancestorDeptIds));
if (CollectionUtil.isNotEmpty(ancestorDepts)) {
// 提取所有leader字段的内容
List<String> leaderNames = ancestorDepts.stream()
.map(SysDept::getLeader)
.filter(StringUtils::isNotBlank)
.distinct()
.collect(Collectors.toList());
// 根据leader名称查询对应的用户ID
if (!leaderNames.isEmpty()) {
List<SysUser> leaders = userMapper.selectList(new LambdaQueryWrapper<SysUser>()
.in(SysUser::getNickName, leaderNames));
if (CollectionUtil.isNotEmpty(leaders)) {
leaderUserIds = leaders.stream()
.map(SysUser::getUserId)
.distinct()
.collect(Collectors.toList());
}
}
}
}
return leaderUserIds;
}
/**
* 修改通用审批（支持请假/外出等申请的审批）
*/
@@ -238,4 +403,80 @@ public class WmsApprovalServiceImpl implements IWmsApprovalService {
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Map<String, Object> approveTask(Long taskId, String approvalOpinion) {
Map<String, Object> result = new HashMap<>();
com.klp.domain.WmsApprovalTask task = approvalTaskMapper.selectById(taskId);
if (task == null) {
result.put("success", false);
result.put("message", "审批任务不存在");
return result;
}
if (!"pending".equals(task.getTaskStatus())) {
result.put("success", false);
result.put("message", "该任务已审批，不能重复审批");
return result;
}
task.setTaskStatus("approved");
task.setApprovalOpinion(approvalOpinion);
task.setApprovalTime(new Date());
approvalTaskMapper.updateById(task);
WmsApproval approval = baseMapper.selectById(task.getApprovalId());
if (approval != null) {
int currentApprovers = (approval.getCurrentApprovers() != null ? approval.getCurrentApprovers() : 0) + 1;
approval.setCurrentApprovers(currentApprovers);
if (currentApprovers >= approval.getRequiredApprovers()) {
approval.setApprovalStatus("已同意");
approval.setFinalStatus("all_approved");
}
baseMapper.updateById(approval);
}
result.put("success", true);
result.put("message", "审批通过");
return result;
}
@Override
@Transactional(rollbackFor = Exception.class)
public Map<String, Object> rejectTask(Long taskId, String approvalOpinion) {
Map<String, Object> result = new HashMap<>();
com.klp.domain.WmsApprovalTask task = approvalTaskMapper.selectById(taskId);
if (task == null) {
result.put("success", false);
result.put("message", "审批任务不存在");
return result;
}
if (!"pending".equals(task.getTaskStatus())) {
result.put("success", false);
result.put("message", "该任务已审批，不能重复审批");
return result;
}
task.setTaskStatus("rejected");
task.setApprovalOpinion(approvalOpinion);
task.setApprovalTime(new Date());
approvalTaskMapper.updateById(task);
WmsApproval approval = baseMapper.selectById(task.getApprovalId());
if (approval != null) {
approval.setApprovalStatus("已驳回");
approval.setFinalStatus("rejected");
baseMapper.updateById(approval);
}
result.put("success", true);
result.put("message", "审批驳回");
return result;
}
}

90
klp-wms/src/main/java/com/klp/service/impl/WmsApprovalTaskServiceImpl.java Normal file
View File

@@ -0,0 +1,90 @@
package com.klp.service.impl;
import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.klp.common.core.page.TableDataInfo;
import com.klp.common.core.domain.PageQuery;
import com.klp.domain.WmsApprovalTask;
import com.klp.domain.bo.WmsApprovalTaskBo;
import com.klp.domain.vo.WmsApprovalTaskVo;
import com.klp.mapper.WmsApprovalTaskMapper;
import com.klp.service.IWmsApprovalTaskService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
import java.util.Collection;
import java.util.List;
/**
* 审批任务Service业务层处理
*
* @author klp
* @date 2026-01-20
*/
@RequiredArgsConstructor
@Service
public class WmsApprovalTaskServiceImpl implements IWmsApprovalTaskService {
private final WmsApprovalTaskMapper baseMapper;
@Override
public WmsApprovalTaskVo queryById(Long taskId) {
return baseMapper.selectVoById(taskId);
}
@Override
public TableDataInfo<WmsApprovalTaskVo> queryPageList(WmsApprovalTaskBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsApprovalTask> lqw = buildQueryWrapper(bo);
Page<WmsApprovalTaskVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
return TableDataInfo.build(result);
}
@Override
public List<WmsApprovalTaskVo> queryList(WmsApprovalTaskBo bo) {
LambdaQueryWrapper<WmsApprovalTask> lqw = buildQueryWrapper(bo);
return baseMapper.selectVoList(lqw);
}
private LambdaQueryWrapper<WmsApprovalTask> buildQueryWrapper(WmsApprovalTaskBo bo) {
LambdaQueryWrapper<WmsApprovalTask> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getApprovalId() != null, WmsApprovalTask::getApprovalId, bo.getApprovalId());
lqw.eq(bo.getApproverId() != null, WmsApprovalTask::getApproverId, bo.getApproverId());
lqw.eq(bo.getApproverName() != null, WmsApprovalTask::getApproverName, bo.getApproverName());
lqw.eq(bo.getTaskStatus() != null, WmsApprovalTask::getTaskStatus, bo.getTaskStatus());
lqw.orderByDesc(WmsApprovalTask::getCreateTime);
return lqw;
}
@Override
public Boolean insertByBo(WmsApprovalTaskBo bo) {
WmsApprovalTask add = BeanUtil.toBean(bo, WmsApprovalTask.class);
validEntityBeforeSave(add);
return baseMapper.insert(add) > 0;
}
private void validEntityBeforeSave(WmsApprovalTask entity) {
}
@Override
public Boolean updateByBo(WmsApprovalTaskBo bo) {
WmsApprovalTask update = BeanUtil.toBean(bo, WmsApprovalTask.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
}
@Override
public Boolean deleteWithValidByIds(Collection<Long> ids, Boolean isValid) {
if (isValid) {
}
return baseMapper.deleteBatchIds(ids) > 0;
}
@Override
public List<WmsApprovalTaskVo> queryByApprovalId(Long approvalId) {
return baseMapper.selectVoList(Wrappers.<WmsApprovalTask>lambdaQuery()
.eq(WmsApprovalTask::getApprovalId, approvalId)
.orderByAsc(WmsApprovalTask::getCreateTime));
}
}