diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java index f248de8f..d848a93f 100644 --- a/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsLeaveRequestBo.java @@ -93,5 +93,8 @@ public class WmsLeaveRequestBo extends BaseEntity { // 审批人 private String approverName; + // 审批类型 + private String approvalType; + } 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 2d520ed1..a26b2af4 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 @@ -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;