From 8414d48dc84ff2e3e7545d84420971574400986b Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Wed, 18 Mar 2026 10:06:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E8=BD=AC=E5=B2=97=E8=AE=B0=E5=BD=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 创建员工转岗记录实体类 WmsEmployeeTransfer - 实现员工转岗记录服务接口 IWmsEmployeeTransferService - 添加员工转岗记录控制器 WmsEmployeeTransferController - 创建员工转岗记录数据访问层 WmsEmployeeTransferMapper - 实现员工转岗记录业务逻辑 WmsEmployeeTransferServiceImpl - 定义员工转岗记录业务对象 WmsEmployeeTransferBo 和视图对象 WmsEmployeeTransferVo - 配置员工转岗记录 MyBatis 映射文件 - 实现员工转岗记录的增删改查功能 - 添加员工转岗记录导出功能 --- .../WmsEmployeeTransferController.java | 99 +++++++++++++++ .../com/klp/domain/WmsEmployeeTransfer.java | 79 ++++++++++++ .../klp/domain/bo/WmsEmployeeTransferBo.java | 83 ++++++++++++ .../klp/domain/vo/WmsEmployeeTransferVo.java | 98 +++++++++++++++ .../klp/mapper/WmsEmployeeTransferMapper.java | 15 +++ .../service/IWmsEmployeeTransferService.java | 49 ++++++++ .../impl/WmsEmployeeTransferServiceImpl.java | 118 ++++++++++++++++++ .../mapper/klp/WmsEmployeeTransferMapper.xml | 28 +++++ 8 files changed, 569 insertions(+) create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsEmployeeTransferController.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsEmployeeTransfer.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeTransferBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeTransferVo.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsEmployeeTransferMapper.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsEmployeeTransferService.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeTransferServiceImpl.java create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsEmployeeTransferMapper.xml diff --git a/klp-wms/src/main/java/com/klp/controller/WmsEmployeeTransferController.java b/klp-wms/src/main/java/com/klp/controller/WmsEmployeeTransferController.java new file mode 100644 index 00000000..dbb44e45 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsEmployeeTransferController.java @@ -0,0 +1,99 @@ +package com.klp.controller; + +import java.util.List; +import java.util.Arrays; + +import lombok.RequiredArgsConstructor; +import javax.servlet.http.HttpServletResponse; +import javax.validation.constraints.*; +import org.springframework.web.bind.annotation.*; +import org.springframework.validation.annotation.Validated; +import com.klp.common.annotation.RepeatSubmit; +import com.klp.common.annotation.Log; +import com.klp.common.core.controller.BaseController; +import com.klp.common.core.domain.PageQuery; +import com.klp.common.core.domain.R; +import com.klp.common.core.validate.AddGroup; +import com.klp.common.core.validate.EditGroup; +import com.klp.common.enums.BusinessType; +import com.klp.common.utils.poi.ExcelUtil; +import com.klp.domain.vo.WmsEmployeeTransferVo; +import com.klp.domain.bo.WmsEmployeeTransferBo; +import com.klp.service.IWmsEmployeeTransferService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 员工转岗记录 + * + * @author klp + * @date 2026-03-18 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/employeeTransfer") +public class WmsEmployeeTransferController extends BaseController { + + private final IWmsEmployeeTransferService iWmsEmployeeTransferService; + + /** + * 查询员工转岗记录列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsEmployeeTransferBo bo, PageQuery pageQuery) { + return iWmsEmployeeTransferService.queryPageList(bo, pageQuery); + } + + /** + * 导出员工转岗记录列表 + */ + @Log(title = "员工转岗记录", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsEmployeeTransferBo bo, HttpServletResponse response) { + List list = iWmsEmployeeTransferService.queryList(bo); + ExcelUtil.exportExcel(list, "员工转岗记录", WmsEmployeeTransferVo.class, response); + } + + /** + * 获取员工转岗记录详细信息 + * + * @param transferId 主键 + */ + @GetMapping("/{transferId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long transferId) { + return R.ok(iWmsEmployeeTransferService.queryById(transferId)); + } + + /** + * 新增员工转岗记录 + */ + @Log(title = "员工转岗记录", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsEmployeeTransferBo bo) { + return toAjax(iWmsEmployeeTransferService.insertByBo(bo)); + } + + /** + * 修改员工转岗记录 + */ + @Log(title = "员工转岗记录", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsEmployeeTransferBo bo) { + return toAjax(iWmsEmployeeTransferService.updateByBo(bo)); + } + + /** + * 删除员工转岗记录 + * + * @param transferIds 主键串 + */ + @Log(title = "员工转岗记录", businessType = BusinessType.DELETE) + @DeleteMapping("/{transferIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] transferIds) { + return toAjax(iWmsEmployeeTransferService.deleteWithValidByIds(Arrays.asList(transferIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeTransfer.java b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeTransfer.java new file mode 100644 index 00000000..fd167e4e --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeTransfer.java @@ -0,0 +1,79 @@ +package com.klp.domain; + +import com.baomidou.mybatisplus.annotation.*; +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 员工转岗记录对象 wms_employee_transfer + * + * @author klp + * @date 2026-03-18 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_employee_transfer") +public class WmsEmployeeTransfer extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 转岗记录主键ID + */ + @TableId(value = "transfer_id") + private Long transferId; + /** + * 关联员工信息表的主键ID + */ + private Long infoId; + /** + * 原部门 + */ + private String oldDept; + /** + * 原岗位工种 + */ + private String oldJobType; + /** + * 新部门 + */ + private String newDept; + /** + * 新岗位工种 + */ + private String newJobType; + /** + * 转岗生效时间 + */ + private Date transferTime; + /** + * 转岗原因 + */ + private String transferReason; + /** + * 转岗经办人 + */ + private String transferHandler; + /** + * 审批状态：0=待审批，1=已审批，2=已驳回 + */ + private Integer approvalStatus; + /** + * 附件（如转岗审批单等） + */ + private String attachment; + /** + * 逻辑删除标识：0=正常，1=已删 + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeTransferBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeTransferBo.java new file mode 100644 index 00000000..2ac14575 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeTransferBo.java @@ -0,0 +1,83 @@ +package com.klp.domain.bo; + +import com.klp.common.core.domain.BaseEntity; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; + +/** + * 员工转岗记录业务对象 wms_employee_transfer + * + * @author klp + * @date 2026-03-18 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsEmployeeTransferBo extends BaseEntity { + + /** + * 转岗记录主键ID + */ + private Long transferId; + + /** + * 关联员工信息表的主键ID + */ + private Long infoId; + + /** + * 原部门 + */ + private String oldDept; + + /** + * 原岗位工种 + */ + private String oldJobType; + + /** + * 新部门 + */ + private String newDept; + + /** + * 新岗位工种 + */ + private String newJobType; + + /** + * 转岗生效时间 + */ + private Date transferTime; + + /** + * 转岗原因 + */ + private String transferReason; + + /** + * 转岗经办人 + */ + private String transferHandler; + + /** + * 审批状态：0=待审批，1=已审批，2=已驳回 + */ + private Integer approvalStatus; + + /** + * 附件（如转岗审批单等） + */ + private String attachment; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeTransferVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeTransferVo.java new file mode 100644 index 00000000..8d355d32 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeTransferVo.java @@ -0,0 +1,98 @@ +package com.klp.domain.vo; + +import java.util.Date; +import com.fasterxml.jackson.annotation.JsonFormat; +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.klp.common.annotation.ExcelDictFormat; +import com.klp.common.convert.ExcelDictConvert; +import lombok.Data; + + +/** + * 员工转岗记录视图对象 wms_employee_transfer + * + * @author klp + * @date 2026-03-18 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsEmployeeTransferVo { + + private static final long serialVersionUID = 1L; + + /** + * 转岗记录主键ID + */ + @ExcelProperty(value = "转岗记录主键ID") + private Long transferId; + + /** + * 关联员工信息表的主键ID + */ + @ExcelProperty(value = "关联员工信息表的主键ID") + private Long infoId; + + /** + * 原部门 + */ + @ExcelProperty(value = "原部门") + private String oldDept; + + /** + * 原岗位工种 + */ + @ExcelProperty(value = "原岗位工种") + private String oldJobType; + + /** + * 新部门 + */ + @ExcelProperty(value = "新部门") + private String newDept; + + /** + * 新岗位工种 + */ + @ExcelProperty(value = "新岗位工种") + private String newJobType; + + /** + * 转岗生效时间 + */ + @ExcelProperty(value = "转岗生效时间") + private Date transferTime; + + /** + * 转岗原因 + */ + @ExcelProperty(value = "转岗原因") + private String transferReason; + + /** + * 转岗经办人 + */ + @ExcelProperty(value = "转岗经办人") + private String transferHandler; + + /** + * 审批状态：0=待审批，1=已审批，2=已驳回 + */ + @ExcelProperty(value = "审批状态：0=待审批，1=已审批，2=已驳回") + private Integer approvalStatus; + + /** + * 附件（如转岗审批单等） + */ + @ExcelProperty(value = "附件", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "如=转岗审批单等") + private String attachment; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsEmployeeTransferMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsEmployeeTransferMapper.java new file mode 100644 index 00000000..2f5608f1 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsEmployeeTransferMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsEmployeeTransfer; +import com.klp.domain.vo.WmsEmployeeTransferVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 员工转岗记录Mapper接口 + * + * @author klp + * @date 2026-03-18 + */ +public interface WmsEmployeeTransferMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsEmployeeTransferService.java b/klp-wms/src/main/java/com/klp/service/IWmsEmployeeTransferService.java new file mode 100644 index 00000000..e1c07f6e --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsEmployeeTransferService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsEmployeeTransfer; +import com.klp.domain.vo.WmsEmployeeTransferVo; +import com.klp.domain.bo.WmsEmployeeTransferBo; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; + +/** + * 员工转岗记录Service接口 + * + * @author klp + * @date 2026-03-18 + */ +public interface IWmsEmployeeTransferService { + + /** + * 查询员工转岗记录 + */ + WmsEmployeeTransferVo queryById(Long transferId); + + /** + * 查询员工转岗记录列表 + */ + TableDataInfo queryPageList(WmsEmployeeTransferBo bo, PageQuery pageQuery); + + /** + * 查询员工转岗记录列表 + */ + List queryList(WmsEmployeeTransferBo bo); + + /** + * 新增员工转岗记录 + */ + Boolean insertByBo(WmsEmployeeTransferBo bo); + + /** + * 修改员工转岗记录 + */ + Boolean updateByBo(WmsEmployeeTransferBo bo); + + /** + * 校验并批量删除员工转岗记录信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeTransferServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeTransferServiceImpl.java new file mode 100644 index 00000000..dfd1a88e --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeTransferServiceImpl.java @@ -0,0 +1,118 @@ +package com.klp.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import com.klp.common.core.page.TableDataInfo; +import com.klp.common.core.domain.PageQuery; +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 lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.klp.domain.bo.WmsEmployeeTransferBo; +import com.klp.domain.vo.WmsEmployeeTransferVo; +import com.klp.domain.WmsEmployeeTransfer; +import com.klp.mapper.WmsEmployeeTransferMapper; +import com.klp.service.IWmsEmployeeTransferService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 员工转岗记录Service业务层处理 + * + * @author klp + * @date 2026-03-18 + */ +@RequiredArgsConstructor +@Service +public class WmsEmployeeTransferServiceImpl implements IWmsEmployeeTransferService { + + private final WmsEmployeeTransferMapper baseMapper; + + /** + * 查询员工转岗记录 + */ + @Override + public WmsEmployeeTransferVo queryById(Long transferId){ + return baseMapper.selectVoById(transferId); + } + + /** + * 查询员工转岗记录列表 + */ + @Override + public TableDataInfo queryPageList(WmsEmployeeTransferBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询员工转岗记录列表 + */ + @Override + public List queryList(WmsEmployeeTransferBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsEmployeeTransferBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getInfoId() != null, WmsEmployeeTransfer::getInfoId, bo.getInfoId()); + lqw.eq(StringUtils.isNotBlank(bo.getOldDept()), WmsEmployeeTransfer::getOldDept, bo.getOldDept()); + lqw.eq(StringUtils.isNotBlank(bo.getOldJobType()), WmsEmployeeTransfer::getOldJobType, bo.getOldJobType()); + lqw.eq(StringUtils.isNotBlank(bo.getNewDept()), WmsEmployeeTransfer::getNewDept, bo.getNewDept()); + lqw.eq(StringUtils.isNotBlank(bo.getNewJobType()), WmsEmployeeTransfer::getNewJobType, bo.getNewJobType()); + lqw.eq(bo.getTransferTime() != null, WmsEmployeeTransfer::getTransferTime, bo.getTransferTime()); + lqw.eq(StringUtils.isNotBlank(bo.getTransferReason()), WmsEmployeeTransfer::getTransferReason, bo.getTransferReason()); + lqw.eq(StringUtils.isNotBlank(bo.getTransferHandler()), WmsEmployeeTransfer::getTransferHandler, bo.getTransferHandler()); + lqw.eq(bo.getApprovalStatus() != null, WmsEmployeeTransfer::getApprovalStatus, bo.getApprovalStatus()); + lqw.eq(StringUtils.isNotBlank(bo.getAttachment()), WmsEmployeeTransfer::getAttachment, bo.getAttachment()); + return lqw; + } + + /** + * 新增员工转岗记录 + */ + @Override + public Boolean insertByBo(WmsEmployeeTransferBo bo) { + WmsEmployeeTransfer add = BeanUtil.toBean(bo, WmsEmployeeTransfer.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setTransferId(add.getTransferId()); + } + return flag; + } + + /** + * 修改员工转岗记录 + */ + @Override + public Boolean updateByBo(WmsEmployeeTransferBo bo) { + WmsEmployeeTransfer update = BeanUtil.toBean(bo, WmsEmployeeTransfer.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsEmployeeTransfer entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除员工转岗记录 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/klp-wms/src/main/resources/mapper/klp/WmsEmployeeTransferMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeTransferMapper.xml new file mode 100644 index 00000000..d4f110ca --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeTransferMapper.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + + + + + + + + + + + + +