feat(wms): 添加员工转岗功能
- 在IWmsEmployeeTransferService中新增employeeTransfer方法 - 在WmsEmployeeTransferController中添加transfer接口 - 实现WmsEmployeeTransferServiceImpl中的员工转岗业务逻辑 - 添加事务注解确保数据一致性 - 在查询方法中关联员工信息表获取完整数据 - 验证员工状态确保在职员工才能转岗 - 记录转岗前后的部门和岗位信息 - 更新WmsEmployeeTransferVo以包含员工信息字段
This commit is contained in:
@@ -9,10 +9,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
import com.klp.common.utils.StringUtils;
|
||||
import lombok.RequiredArgsConstructor;
|
||||
import org.springframework.stereotype.Service;
|
||||
import org.springframework.transaction.annotation.Transactional;
|
||||
import com.klp.domain.bo.WmsEmployeeTransferBo;
|
||||
import com.klp.domain.vo.WmsEmployeeTransferVo;
|
||||
import com.klp.domain.WmsEmployeeTransfer;
|
||||
import com.klp.domain.WmsEmployeeInfo;
|
||||
import com.klp.mapper.WmsEmployeeTransferMapper;
|
||||
import com.klp.mapper.WmsEmployeeInfoMapper;
|
||||
import com.klp.service.IWmsEmployeeTransferService;
|
||||
|
||||
import java.util.List;
|
||||
@@ -30,13 +33,19 @@ import java.util.Collection;
|
||||
public class WmsEmployeeTransferServiceImpl implements IWmsEmployeeTransferService {
|
||||
|
||||
private final WmsEmployeeTransferMapper baseMapper;
|
||||
private final WmsEmployeeInfoMapper wmsEmployeeInfoMapper;
|
||||
|
||||
/**
|
||||
* 查询员工转岗记录
|
||||
*/
|
||||
@Override
|
||||
public WmsEmployeeTransferVo queryById(Long transferId){
|
||||
return baseMapper.selectVoById(transferId);
|
||||
WmsEmployeeTransferVo vo = baseMapper.selectVoById(transferId);
|
||||
if (vo != null && vo.getInfoId() != null) {
|
||||
WmsEmployeeInfo employee = wmsEmployeeInfoMapper.selectById(vo.getInfoId());
|
||||
vo.setWmsEmployeeInfo(employee);
|
||||
}
|
||||
return vo;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -46,6 +55,12 @@ public class WmsEmployeeTransferServiceImpl implements IWmsEmployeeTransferServi
|
||||
public TableDataInfo<WmsEmployeeTransferVo> queryPageList(WmsEmployeeTransferBo bo, PageQuery pageQuery) {
|
||||
LambdaQueryWrapper<WmsEmployeeTransfer> lqw = buildQueryWrapper(bo);
|
||||
Page<WmsEmployeeTransferVo> result = baseMapper.selectVoPage(pageQuery.build(), lqw);
|
||||
for (WmsEmployeeTransferVo vo : result.getRecords()) {
|
||||
if (vo.getInfoId() != null) {
|
||||
WmsEmployeeInfo employee = wmsEmployeeInfoMapper.selectById(vo.getInfoId());
|
||||
vo.setWmsEmployeeInfo(employee);
|
||||
}
|
||||
}
|
||||
return TableDataInfo.build(result);
|
||||
}
|
||||
|
||||
@@ -55,7 +70,14 @@ public class WmsEmployeeTransferServiceImpl implements IWmsEmployeeTransferServi
|
||||
@Override
|
||||
public List<WmsEmployeeTransferVo> queryList(WmsEmployeeTransferBo bo) {
|
||||
LambdaQueryWrapper<WmsEmployeeTransfer> lqw = buildQueryWrapper(bo);
|
||||
return baseMapper.selectVoList(lqw);
|
||||
List<WmsEmployeeTransferVo> list = baseMapper.selectVoList(lqw);
|
||||
for (WmsEmployeeTransferVo vo : list) {
|
||||
if (vo.getInfoId() != null) {
|
||||
WmsEmployeeInfo employee = wmsEmployeeInfoMapper.selectById(vo.getInfoId());
|
||||
vo.setWmsEmployeeInfo(employee);
|
||||
}
|
||||
}
|
||||
return list;
|
||||
}
|
||||
|
||||
private LambdaQueryWrapper<WmsEmployeeTransfer> buildQueryWrapper(WmsEmployeeTransferBo bo) {
|
||||
@@ -115,4 +137,53 @@ public class WmsEmployeeTransferServiceImpl implements IWmsEmployeeTransferServi
|
||||
}
|
||||
return baseMapper.deleteBatchIds(ids) > 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* 员工转岗
|
||||
*/
|
||||
@Override
|
||||
@Transactional(rollbackFor = Exception.class)
|
||||
public Boolean employeeTransfer(WmsEmployeeTransferBo bo) {
|
||||
if (bo.getInfoId() == null) {
|
||||
throw new RuntimeException("员工ID不能为空");
|
||||
}
|
||||
WmsEmployeeInfo employee = wmsEmployeeInfoMapper.selectById(bo.getInfoId());
|
||||
if (employee == null) {
|
||||
throw new RuntimeException("员工不存在");
|
||||
}
|
||||
if (employee.getIsLeave() != null && employee.getIsLeave() == 1) {
|
||||
throw new RuntimeException("员工已离职,无法转岗");
|
||||
}
|
||||
|
||||
bo.setOldDept(employee.getDept());
|
||||
bo.setOldJobType(employee.getJobType());
|
||||
|
||||
WmsEmployeeInfo update = new WmsEmployeeInfo();
|
||||
update.setInfoId(bo.getInfoId());
|
||||
if (bo.getNewDept() != null) {
|
||||
update.setDept(bo.getNewDept());
|
||||
}
|
||||
if (bo.getNewJobType() != null) {
|
||||
update.setJobType(bo.getNewJobType());
|
||||
}
|
||||
boolean flag = wmsEmployeeInfoMapper.updateById(update) > 0;
|
||||
if (!flag) {
|
||||
return false;
|
||||
}
|
||||
|
||||
WmsEmployeeTransfer transfer = new WmsEmployeeTransfer();
|
||||
transfer.setInfoId(bo.getInfoId());
|
||||
transfer.setOldDept(bo.getOldDept());
|
||||
transfer.setOldJobType(bo.getOldJobType());
|
||||
transfer.setNewDept(bo.getNewDept());
|
||||
transfer.setNewJobType(bo.getNewJobType());
|
||||
transfer.setTransferTime(bo.getTransferTime());
|
||||
transfer.setTransferReason(bo.getTransferReason());
|
||||
transfer.setTransferHandler(bo.getTransferHandler());
|
||||
transfer.setAttachment(bo.getAttachment());
|
||||
transfer.setRemark(bo.getRemark());
|
||||
transfer.setCreateBy(bo.getCreateBy());
|
||||
transfer.setApprovalStatus(1);
|
||||
return baseMapper.insert(transfer) > 0;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user