diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java index b84bfbc4..3381fdac 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsLeaveRequestVo.java @@ -95,5 +95,19 @@ public class WmsLeaveRequestVo extends BaseEntity { private String createByName; + /** + * 审批状态(待审批/已同意/已驳回/已撤销) + */ + private String approvalStatus; + + /** + * 审批类型(single=单人审批,multi=多级审批) + */ + private String approvalType; + + /** + * 审批人姓名 + */ + private String approverName; } diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsOutRequestVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsOutRequestVo.java index af5b8618..cf5366f4 100644 --- a/klp-wms/src/main/java/com/klp/domain/vo/WmsOutRequestVo.java +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsOutRequestVo.java @@ -94,5 +94,19 @@ public class WmsOutRequestVo extends BaseEntity { private String createByName; + /** + * 审批状态(待审批/已同意/已驳回/已撤销) + */ + private String approvalStatus; + + /** + * 审批类型(single=单人审批,multi=多级审批) + */ + private String approvalType; + + /** + * 审批人姓名 + */ + private String approverName; } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java index 8064f080..dbec4e9d 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsLeaveRequestServiceImpl.java @@ -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 queryPageList(WmsLeaveRequestBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(row -> { + // 获取审批信息 + WmsApprovalBo approval = new WmsApprovalBo(); + approval.setApplyId(row.getLeaveId()); + approval.setApplyType("leave"); + List 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); } diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsOutRequestServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsOutRequestServiceImpl.java index b33c732e..88b668a3 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsOutRequestServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsOutRequestServiceImpl.java @@ -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 queryPageList(WmsOutRequestBo bo, PageQuery pageQuery) { LambdaQueryWrapper lqw = buildQueryWrapper(bo); Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + result.getRecords().forEach(row -> { + // 获取审批信息 + WmsApprovalBo approval = new WmsApprovalBo(); + approval.setApplyId(row.getOutId()); + approval.setApplyType("out"); + List 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); }