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

feat(wms): 添加请假和出库申请的审批信息显示功能

Browse Source 
- 在WmsLeaveRequestVo和WmsOutRequestVo中新增审批状态、审批类型和审批人姓名字段
- 在WmsLeaveRequestServiceImpl的查询方法中集成审批信息获取逻辑
- 在WmsOutRequestServiceImpl的查询方法中集成审批信息获取逻辑
- 通过审批服务查询并填充每条记录的审批相关信息
- 实现了统一的审批信息展示功能，提升用户体验
This commit is contained in:
Joshi
2026-05-15 13:38:54 +08:00
parent 2f974c4b6f
commit ffecaf9a5a
4 changed files with 56 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java
View File

@@ -95,5 +95,19 @@ public class WmsLeaveRequestVo extends BaseEntity {
private String createByName;
/**
* 审批状态（待审批/已同意/已驳回/已撤销）
*/
private String approvalStatus;
/**
* 审批类型（single=单人审批，multi=多级审批）
*/
private String approvalType;
/**
* 审批人姓名
*/
private String approverName;
}

14
klp-wms/src/main/java/com/klp/domain/vo/WmsOutRequestVo.java
View File

@@ -94,5 +94,19 @@ public class WmsOutRequestVo extends BaseEntity {
private String createByName;
/**
* 审批状态（待审批/已同意/已驳回/已撤销）
*/
private String approvalStatus;
/**
* 审批类型（single=单人审批，multi=多级审批）
*/
private String approvalType;
/**
* 审批人姓名
*/
private String approverName;
}

14
klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java
View File

@@ -8,6 +8,7 @@ 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.domain.vo.WmsApprovalVo;
import com.klp.service.IWmsApprovalService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -51,6 +52,19 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService {
public TableDataInfo<WmsLeaveRequestVo> queryPageList(WmsLeaveRequestBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsLeaveRequest> lqw = buildQueryWrapper(bo);
Page<WmsLeaveRequestVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
result.getRecords().forEach(row -> {
// 获取审批信息
WmsApprovalBo approval = new WmsApprovalBo();
approval.setApplyId(row.getLeaveId());
approval.setApplyType("leave");
List<WmsApprovalVo> approvals = approvalService.queryList(approval);
if (!approvals.isEmpty()) {
WmsApprovalVo approvalVo = approvals.get(0);
row.setApprovalStatus(approvalVo.getApprovalStatus());
row.setApprovalType(approvalVo.getApprovalType());
row.setApproverName(approvalVo.getApproverName());
}
});
return TableDataInfo.build(result);
}

14
klp-wms/src/main/java/com/klp/service/impl/WmsOutRequestServiceImpl.java
View File

@@ -8,6 +8,7 @@ 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.domain.vo.WmsApprovalVo;
import com.klp.service.IWmsApprovalService;
import lombok.RequiredArgsConstructor;
import org.springframework.stereotype.Service;
@@ -52,6 +53,19 @@ public class WmsOutRequestServiceImpl implements IWmsOutRequestService {
public TableDataInfo<WmsOutRequestVo> queryPageList(WmsOutRequestBo bo, PageQuery pageQuery) {
LambdaQueryWrapper<WmsOutRequest> lqw = buildQueryWrapper(bo);
Page<WmsOutRequestVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
result.getRecords().forEach(row -> {
// 获取审批信息
WmsApprovalBo approval = new WmsApprovalBo();
approval.setApplyId(row.getOutId());
approval.setApplyType("out");
List<WmsApprovalVo> approvals = approvalService.queryList(approval);
if (!approvals.isEmpty()) {
WmsApprovalVo approvalVo = approvals.get(0);
row.setApprovalStatus(approvalVo.getApprovalStatus());
row.setApprovalType(approvalVo.getApprovalType());
row.setApproverName(approvalVo.getApproverName());
}
});
return TableDataInfo.build(result);
}