From e0b4d167019dc9aa6e1aa52e691c3126c217ddc1 Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 14 Mar 2026 09:54:40 +0800 Subject: [PATCH] =?UTF-8?q?feat(wms):=20=E6=B7=BB=E5=8A=A0=E5=91=98?= =?UTF-8?q?=E5=B7=A5=E5=BC=82=E5=8A=A8=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 创建员工异动实体类 WmsEmployeeChange，包含异动记录主键、员工信息关联、异动类型等字段 - 定义员工异动业务对象 WmsEmployeeChangeBo 和视图对象 WmsEmployeeChangeVo - 实现员工异动服务接口 IWmsEmployeeChangeService 及其具体实现类 WmsEmployeeChangeServiceImpl - 添加员工异动数据访问层 WmsEmployeeChangeMapper 及对应的 MyBatis XML 映射文件 - 开发员工异动控制器 WmsEmployeeChangeController，提供增删改查及导出功能 - 集成分页查询、数据校验、重复提交防护等通用功能 --- .../WmsEmployeeChangeController.java | 99 +++++++++++++++ .../com/klp/domain/WmsEmployeeChange.java | 63 ++++++++++ .../klp/domain/bo/WmsEmployeeChangeBo.java | 63 ++++++++++ .../klp/domain/vo/WmsEmployeeChangeVo.java | 75 ++++++++++++ .../klp/mapper/WmsEmployeeChangeMapper.java | 15 +++ .../service/IWmsEmployeeChangeService.java | 49 ++++++++ .../impl/WmsEmployeeChangeServiceImpl.java | 114 ++++++++++++++++++ .../mapper/klp/WmsEmployeeChangeMapper.xml | 24 ++++ 8 files changed, 502 insertions(+) create mode 100644 klp-wms/src/main/java/com/klp/controller/WmsEmployeeChangeController.java create mode 100644 klp-wms/src/main/java/com/klp/domain/WmsEmployeeChange.java create mode 100644 klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeChangeBo.java create mode 100644 klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeChangeVo.java create mode 100644 klp-wms/src/main/java/com/klp/mapper/WmsEmployeeChangeMapper.java create mode 100644 klp-wms/src/main/java/com/klp/service/IWmsEmployeeChangeService.java create mode 100644 klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeChangeServiceImpl.java create mode 100644 klp-wms/src/main/resources/mapper/klp/WmsEmployeeChangeMapper.xml diff --git a/klp-wms/src/main/java/com/klp/controller/WmsEmployeeChangeController.java b/klp-wms/src/main/java/com/klp/controller/WmsEmployeeChangeController.java new file mode 100644 index 00000000..6231171a --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsEmployeeChangeController.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.WmsEmployeeChangeVo; +import com.klp.domain.bo.WmsEmployeeChangeBo; +import com.klp.service.IWmsEmployeeChangeService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 员工异动（入职/离职） + * + * @author klp + * @date 2026-03-14 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/employeeChange") +public class WmsEmployeeChangeController extends BaseController { + + private final IWmsEmployeeChangeService iWmsEmployeeChangeService; + + /** + * 查询员工异动（入职/离职）列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsEmployeeChangeBo bo, PageQuery pageQuery) { + return iWmsEmployeeChangeService.queryPageList(bo, pageQuery); + } + + /** + * 导出员工异动（入职/离职）列表 + */ + @Log(title = "员工异动（入职/离职）", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsEmployeeChangeBo bo, HttpServletResponse response) { + List list = iWmsEmployeeChangeService.queryList(bo); + ExcelUtil.exportExcel(list, "员工异动（入职/离职）", WmsEmployeeChangeVo.class, response); + } + + /** + * 获取员工异动（入职/离职）详细信息 + * + * @param changeId 主键 + */ + @GetMapping("/{changeId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long changeId) { + return R.ok(iWmsEmployeeChangeService.queryById(changeId)); + } + + /** + * 新增员工异动（入职/离职） + */ + @Log(title = "员工异动（入职/离职）", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsEmployeeChangeBo bo) { + return toAjax(iWmsEmployeeChangeService.insertByBo(bo)); + } + + /** + * 修改员工异动（入职/离职） + */ + @Log(title = "员工异动（入职/离职）", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsEmployeeChangeBo bo) { + return toAjax(iWmsEmployeeChangeService.updateByBo(bo)); + } + + /** + * 删除员工异动（入职/离职） + * + * @param changeIds 主键串 + */ + @Log(title = "员工异动（入职/离职）", businessType = BusinessType.DELETE) + @DeleteMapping("/{changeIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] changeIds) { + return toAjax(iWmsEmployeeChangeService.deleteWithValidByIds(Arrays.asList(changeIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeChange.java b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeChange.java new file mode 100644 index 00000000..db3615cb --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeChange.java @@ -0,0 +1,63 @@ +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_change + * + * @author klp + * @date 2026-03-14 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_employee_change") +public class WmsEmployeeChange extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 异动记录主键ID + */ + @TableId(value = "change_id") + private Long changeId; + /** + * 关联员工信息表的主键ID + */ + private Long infoId; + /** + * 异动类型：0=入职，1=离职 + */ + private Integer changeType; + /** + * 异动时间（入职/离职时间） + */ + private Date changeTime; + /** + * 异动原因（离职必填，入职可选） + */ + private String changeReason; + /** + * 负责人 + */ + private String changeHandler; + /** + * 附件 + */ + private String attachment; + /** + * 逻辑删除标识：0=正常，1=已删 + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeChangeBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeChangeBo.java new file mode 100644 index 00000000..548583a4 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeChangeBo.java @@ -0,0 +1,63 @@ +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_change + * + * @author klp + * @date 2026-03-14 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsEmployeeChangeBo extends BaseEntity { + + /** + * 异动记录主键ID + */ + private Long changeId; + + /** + * 关联员工信息表的主键ID + */ + private Long infoId; + + /** + * 异动类型：0=入职，1=离职 + */ + private Integer changeType; + + /** + * 异动时间（入职/离职时间） + */ + private Date changeTime; + + /** + * 异动原因（离职必填，入职可选） + */ + private String changeReason; + + /** + * 负责人 + */ + private String changeHandler; + + /** + * 附件 + */ + private String attachment; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeChangeVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeChangeVo.java new file mode 100644 index 00000000..f69ce77b --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeChangeVo.java @@ -0,0 +1,75 @@ +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_change + * + * @author klp + * @date 2026-03-14 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsEmployeeChangeVo { + + private static final long serialVersionUID = 1L; + + /** + * 异动记录主键ID + */ + @ExcelProperty(value = "异动记录主键ID") + private Long changeId; + + /** + * 关联员工信息表的主键ID + */ + @ExcelProperty(value = "关联员工信息表的主键ID") + private Long infoId; + + /** + * 异动类型：0=入职，1=离职 + */ + @ExcelProperty(value = "异动类型：0=入职，1=离职") + private Integer changeType; + + /** + * 异动时间（入职/离职时间） + */ + @ExcelProperty(value = "异动时间", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "入=职/离职时间") + private Date changeTime; + + /** + * 异动原因（离职必填，入职可选） + */ + @ExcelProperty(value = "异动原因", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "离=职必填，入职可选") + private String changeReason; + + /** + * 负责人 + */ + @ExcelProperty(value = "负责人") + private String changeHandler; + + /** + * 附件 + */ + @ExcelProperty(value = "附件") + private String attachment; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsEmployeeChangeMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsEmployeeChangeMapper.java new file mode 100644 index 00000000..94a94bcc --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsEmployeeChangeMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsEmployeeChange; +import com.klp.domain.vo.WmsEmployeeChangeVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 员工异动（入职/离职）Mapper接口 + * + * @author klp + * @date 2026-03-14 + */ +public interface WmsEmployeeChangeMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsEmployeeChangeService.java b/klp-wms/src/main/java/com/klp/service/IWmsEmployeeChangeService.java new file mode 100644 index 00000000..6eeddc02 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsEmployeeChangeService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsEmployeeChange; +import com.klp.domain.vo.WmsEmployeeChangeVo; +import com.klp.domain.bo.WmsEmployeeChangeBo; +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-14 + */ +public interface IWmsEmployeeChangeService { + + /** + * 查询员工异动（入职/离职） + */ + WmsEmployeeChangeVo queryById(Long changeId); + + /** + * 查询员工异动（入职/离职）列表 + */ + TableDataInfo queryPageList(WmsEmployeeChangeBo bo, PageQuery pageQuery); + + /** + * 查询员工异动（入职/离职）列表 + */ + List queryList(WmsEmployeeChangeBo bo); + + /** + * 新增员工异动（入职/离职） + */ + Boolean insertByBo(WmsEmployeeChangeBo bo); + + /** + * 修改员工异动（入职/离职） + */ + Boolean updateByBo(WmsEmployeeChangeBo bo); + + /** + * 校验并批量删除员工异动（入职/离职）信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeChangeServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeChangeServiceImpl.java new file mode 100644 index 00000000..2577c20b --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeChangeServiceImpl.java @@ -0,0 +1,114 @@ +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.WmsEmployeeChangeBo; +import com.klp.domain.vo.WmsEmployeeChangeVo; +import com.klp.domain.WmsEmployeeChange; +import com.klp.mapper.WmsEmployeeChangeMapper; +import com.klp.service.IWmsEmployeeChangeService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 员工异动（入职/离职）Service业务层处理 + * + * @author klp + * @date 2026-03-14 + */ +@RequiredArgsConstructor +@Service +public class WmsEmployeeChangeServiceImpl implements IWmsEmployeeChangeService { + + private final WmsEmployeeChangeMapper baseMapper; + + /** + * 查询员工异动（入职/离职） + */ + @Override + public WmsEmployeeChangeVo queryById(Long changeId){ + return baseMapper.selectVoById(changeId); + } + + /** + * 查询员工异动（入职/离职）列表 + */ + @Override + public TableDataInfo queryPageList(WmsEmployeeChangeBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询员工异动（入职/离职）列表 + */ + @Override + public List queryList(WmsEmployeeChangeBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsEmployeeChangeBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getInfoId() != null, WmsEmployeeChange::getInfoId, bo.getInfoId()); + lqw.eq(bo.getChangeType() != null, WmsEmployeeChange::getChangeType, bo.getChangeType()); + lqw.eq(bo.getChangeTime() != null, WmsEmployeeChange::getChangeTime, bo.getChangeTime()); + lqw.eq(StringUtils.isNotBlank(bo.getChangeReason()), WmsEmployeeChange::getChangeReason, bo.getChangeReason()); + lqw.eq(StringUtils.isNotBlank(bo.getChangeHandler()), WmsEmployeeChange::getChangeHandler, bo.getChangeHandler()); + lqw.eq(StringUtils.isNotBlank(bo.getAttachment()), WmsEmployeeChange::getAttachment, bo.getAttachment()); + return lqw; + } + + /** + * 新增员工异动（入职/离职） + */ + @Override + public Boolean insertByBo(WmsEmployeeChangeBo bo) { + WmsEmployeeChange add = BeanUtil.toBean(bo, WmsEmployeeChange.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setChangeId(add.getChangeId()); + } + return flag; + } + + /** + * 修改员工异动（入职/离职） + */ + @Override + public Boolean updateByBo(WmsEmployeeChangeBo bo) { + WmsEmployeeChange update = BeanUtil.toBean(bo, WmsEmployeeChange.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsEmployeeChange 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/WmsEmployeeChangeMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeChangeMapper.xml new file mode 100644 index 00000000..932b8d4d --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeChangeMapper.xml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + + + + + +