feat(approval): 完善审批流程并新增部门管理功能
- 修改审批任务服务接口返回类型为Map以支持复杂数据结构 - 新增WMS部门管理模块,包括实体、业务对象、控制器和实现类 - 添加部门树形结构支持和部门负责人管理功能 - 更新审批流程逻辑,集成部门领导审批机制 - 重构审批任务查询方法以关联审批详情和申请人信息 - 添加部门ID字段到请假和外出申请相关实体中 - 优化多级审批流程,支持基于部门层级的审批链路 - 移除废弃的导入语句并整理代码结构
This commit is contained in:
@@ -7,6 +7,8 @@ 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.utils.StringUtils;
|
||||
import com.klp.domain.bo.WmsApprovalBo;
|
||||
import com.klp.service.IWmsApprovalService;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import com.klp.domain.bo.WmsOutRequestBo;
|
||||
@@ -33,7 +35,7 @@ import com.klp.domain.WmsApproval;
|
||||
public class WmsOutRequestServiceImpl implements IWmsOutRequestService {
|
||||
|
||||
private final WmsOutRequestMapper baseMapper;
|
||||
private final WmsApprovalMapper approvalMapper;
|
||||
private final IWmsApprovalService approvalService;
|
||||
|
||||
/**
|
||||
* 查询员工外出申请
|
||||
@@ -86,13 +88,14 @@ public class WmsOutRequestServiceImpl implements IWmsOutRequestService {
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setOutId(add.getOutId());
|
||||
WmsApproval approval = new WmsApproval();
|
||||
WmsApprovalBo approval = new WmsApprovalBo();
|
||||
approval.setApplyType("out");
|
||||
approval.setApplyId(add.getOutId());
|
||||
approval.setApprovalStatus("待审批");
|
||||
approval.setApproverName(bo.getApproverName());
|
||||
approvalMapper.insert(approval);
|
||||
approval.setApprovalType(bo.getApprovalType());
|
||||
approval.setDeptId(bo.getDeptId());
|
||||
approvalService.insertByBo(approval);
|
||||
}
|
||||
return flag;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user