feat(wms): 添加请假申请审批类型功能
- 在WmsLeaveRequestBo中新增approvalType字段用于存储审批类型 - 修改WmsLeaveRequestServiceImpl依赖注入从WmsApprovalMapper改为IWmsApprovalService - 更新请假申请保存逻辑使用WmsApprovalBo替代WmsApproval实体 - 实现审批类型的传递和存储功能,将审批信息通过service层插入
This commit is contained in:
@@ -93,5 +93,8 @@ public class WmsLeaveRequestBo extends BaseEntity {
|
||||
// 审批人
|
||||
private String approverName;
|
||||
|
||||
// 审批类型
|
||||
private String approvalType;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -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.WmsLeaveRequestBo;
|
||||
@@ -32,7 +34,7 @@ import com.klp.domain.WmsApproval;
|
||||
public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService {
|
||||
|
||||
private final WmsLeaveRequestMapper baseMapper;
|
||||
private final WmsApprovalMapper approvalMapper;
|
||||
private final IWmsApprovalService approvalService;
|
||||
|
||||
/**
|
||||
* 查询员工请假申请
|
||||
@@ -122,13 +124,13 @@ public class WmsLeaveRequestServiceImpl implements IWmsLeaveRequestService {
|
||||
validEntityBeforeSave(add);
|
||||
boolean flag = baseMapper.insert(add) > 0;
|
||||
if (flag) {
|
||||
bo.setLeaveId(add.getLeaveId());
|
||||
WmsApproval approval = new WmsApproval();
|
||||
WmsApprovalBo approval = new WmsApprovalBo();
|
||||
approval.setApplyType("leave");
|
||||
approval.setApplyId(add.getLeaveId());
|
||||
approval.setApprovalStatus("待审批");
|
||||
approval.setApproverName(bo.getApproverName());
|
||||
approvalMapper.insert(approval);
|
||||
approval.setApprovalType(bo.getApprovalType());
|
||||
approvalService.insertByBo(approval);
|
||||
}
|
||||
|
||||
return flag;
|
||||
|
||||
Reference in New Issue
Block a user