diff --git a/klp-wms/src/main/java/com/klp/controller/WmsEmployeeInfoController.java b/klp-wms/src/main/java/com/klp/controller/WmsEmployeeInfoController.java new file mode 100644 index 00000000..9efc8b6b --- /dev/null +++ b/klp-wms/src/main/java/com/klp/controller/WmsEmployeeInfoController.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.WmsEmployeeInfoVo; +import com.klp.domain.bo.WmsEmployeeInfoBo; +import com.klp.service.IWmsEmployeeInfoService; +import com.klp.common.core.page.TableDataInfo; + +/** + * 员工信息 + * + * @author klp + * @date 2026-03-02 + */ +@Validated +@RequiredArgsConstructor +@RestController +@RequestMapping("/wms/employeeInfo") +public class WmsEmployeeInfoController extends BaseController { + + private final IWmsEmployeeInfoService iWmsEmployeeInfoService; + + /** + * 查询员工信息列表 + */ + @GetMapping("/list") + public TableDataInfo list(WmsEmployeeInfoBo bo, PageQuery pageQuery) { + return iWmsEmployeeInfoService.queryPageList(bo, pageQuery); + } + + /** + * 导出员工信息列表 + */ + @Log(title = "员工信息", businessType = BusinessType.EXPORT) + @PostMapping("/export") + public void export(WmsEmployeeInfoBo bo, HttpServletResponse response) { + List list = iWmsEmployeeInfoService.queryList(bo); + ExcelUtil.exportExcel(list, "员工信息", WmsEmployeeInfoVo.class, response); + } + + /** + * 获取员工信息详细信息 + * + * @param infoId 主键 + */ + @GetMapping("/{infoId}") + public R getInfo(@NotNull(message = "主键不能为空") + @PathVariable Long infoId) { + return R.ok(iWmsEmployeeInfoService.queryById(infoId)); + } + + /** + * 新增员工信息 + */ + @Log(title = "员工信息", businessType = BusinessType.INSERT) + @RepeatSubmit() + @PostMapping() + public R add(@Validated(AddGroup.class) @RequestBody WmsEmployeeInfoBo bo) { + return toAjax(iWmsEmployeeInfoService.insertByBo(bo)); + } + + /** + * 修改员工信息 + */ + @Log(title = "员工信息", businessType = BusinessType.UPDATE) + @RepeatSubmit() + @PutMapping() + public R edit(@Validated(EditGroup.class) @RequestBody WmsEmployeeInfoBo bo) { + return toAjax(iWmsEmployeeInfoService.updateByBo(bo)); + } + + /** + * 删除员工信息 + * + * @param infoIds 主键串 + */ + @Log(title = "员工信息", businessType = BusinessType.DELETE) + @DeleteMapping("/{infoIds}") + public R remove(@NotEmpty(message = "主键不能为空") + @PathVariable Long[] infoIds) { + return toAjax(iWmsEmployeeInfoService.deleteWithValidByIds(Arrays.asList(infoIds), true)); + } +} diff --git a/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java new file mode 100644 index 00000000..c9ed0b12 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/WmsEmployeeInfo.java @@ -0,0 +1,95 @@ +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_info + * + * @author klp + * @date 2026-03-02 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("wms_employee_info") +public class WmsEmployeeInfo extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 主键ID + */ + @TableId(value = "info_id") + private Long infoId; + /** + * 序号 + */ + private Long serialNumber; + /** + * 部门 + */ + private String dept; + /** + * 岗位工种 + */ + private String jobType; + /** + * 姓名 + */ + private String name; + /** + * 身份证号 + */ + private String idCard; + /** + * 年龄 + */ + private Long age; + /** + * 性别(男/女) + */ + private String gender; + /** + * 学历 + */ + private String education; + /** + * 家庭住址 + */ + private String homeAddress; + /** + * 联系电话 + */ + private String phone; + /** + * 入职时间 + */ + private Date entryTime; + /** + * 紧急联系人 + */ + private String emergencyContact; + /** + * 关系 + */ + private String relationship; + /** + * 紧急联系人电话 + */ + private String emergencyContactPhone; + /** + * 逻辑删除标识:0=正常,1=已删 + */ + @TableLogic + private Integer delFlag; + /** + * 备注 + */ + private String remark; + +} diff --git a/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java new file mode 100644 index 00000000..5184504e --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/bo/WmsEmployeeInfoBo.java @@ -0,0 +1,103 @@ +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_info + * + * @author klp + * @date 2026-03-02 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class WmsEmployeeInfoBo extends BaseEntity { + + /** + * 主键ID + */ + private Long infoId; + + /** + * 序号 + */ + private Long serialNumber; + + /** + * 部门 + */ + private String dept; + + /** + * 岗位工种 + */ + private String jobType; + + /** + * 姓名 + */ + private String name; + + /** + * 身份证号 + */ + private String idCard; + + /** + * 年龄 + */ + private Long age; + + /** + * 性别(男/女) + */ + private String gender; + + /** + * 学历 + */ + private String education; + + /** + * 家庭住址 + */ + private String homeAddress; + + /** + * 联系电话 + */ + private String phone; + + /** + * 入职时间 + */ + private Date entryTime; + + /** + * 紧急联系人 + */ + private String emergencyContact; + + /** + * 关系 + */ + private String relationship; + + /** + * 紧急联系人电话 + */ + private String emergencyContactPhone; + + /** + * 备注 + */ + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java b/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java new file mode 100644 index 00000000..7fb0e226 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/domain/vo/WmsEmployeeInfoVo.java @@ -0,0 +1,122 @@ +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_info + * + * @author klp + * @date 2026-03-02 + */ +@Data +@ExcelIgnoreUnannotated +public class WmsEmployeeInfoVo { + + private static final long serialVersionUID = 1L; + + /** + * 主键ID + */ + @ExcelProperty(value = "主键ID") + private Long infoId; + + /** + * 序号 + */ + @ExcelProperty(value = "序号") + private Long serialNumber; + + /** + * 部门 + */ + @ExcelProperty(value = "部门") + private String dept; + + /** + * 岗位工种 + */ + @ExcelProperty(value = "岗位工种") + private String jobType; + + /** + * 姓名 + */ + @ExcelProperty(value = "姓名") + private String name; + + /** + * 身份证号 + */ + @ExcelProperty(value = "身份证号") + private String idCard; + + /** + * 年龄 + */ + @ExcelProperty(value = "年龄") + private Long age; + + /** + * 性别(男/女) + */ + @ExcelProperty(value = "性别", converter = ExcelDictConvert.class) + @ExcelDictFormat(readConverterExp = "男=/女") + private String gender; + + /** + * 学历 + */ + @ExcelProperty(value = "学历") + private String education; + + /** + * 家庭住址 + */ + @ExcelProperty(value = "家庭住址") + private String homeAddress; + + /** + * 联系电话 + */ + @ExcelProperty(value = "联系电话") + private String phone; + + /** + * 入职时间 + */ + @ExcelProperty(value = "入职时间") + private Date entryTime; + + /** + * 紧急联系人 + */ + @ExcelProperty(value = "紧急联系人") + private String emergencyContact; + + /** + * 关系 + */ + @ExcelProperty(value = "关系") + private String relationship; + + /** + * 紧急联系人电话 + */ + @ExcelProperty(value = "紧急联系人电话") + private String emergencyContactPhone; + + /** + * 备注 + */ + @ExcelProperty(value = "备注") + private String remark; + + +} diff --git a/klp-wms/src/main/java/com/klp/mapper/WmsEmployeeInfoMapper.java b/klp-wms/src/main/java/com/klp/mapper/WmsEmployeeInfoMapper.java new file mode 100644 index 00000000..15a13e0e --- /dev/null +++ b/klp-wms/src/main/java/com/klp/mapper/WmsEmployeeInfoMapper.java @@ -0,0 +1,15 @@ +package com.klp.mapper; + +import com.klp.domain.WmsEmployeeInfo; +import com.klp.domain.vo.WmsEmployeeInfoVo; +import com.klp.common.core.mapper.BaseMapperPlus; + +/** + * 员工信息Mapper接口 + * + * @author klp + * @date 2026-03-02 + */ +public interface WmsEmployeeInfoMapper extends BaseMapperPlus { + +} diff --git a/klp-wms/src/main/java/com/klp/service/IWmsEmployeeInfoService.java b/klp-wms/src/main/java/com/klp/service/IWmsEmployeeInfoService.java new file mode 100644 index 00000000..3479124f --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/IWmsEmployeeInfoService.java @@ -0,0 +1,49 @@ +package com.klp.service; + +import com.klp.domain.WmsEmployeeInfo; +import com.klp.domain.vo.WmsEmployeeInfoVo; +import com.klp.domain.bo.WmsEmployeeInfoBo; +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-02 + */ +public interface IWmsEmployeeInfoService { + + /** + * 查询员工信息 + */ + WmsEmployeeInfoVo queryById(Long infoId); + + /** + * 查询员工信息列表 + */ + TableDataInfo queryPageList(WmsEmployeeInfoBo bo, PageQuery pageQuery); + + /** + * 查询员工信息列表 + */ + List queryList(WmsEmployeeInfoBo bo); + + /** + * 新增员工信息 + */ + Boolean insertByBo(WmsEmployeeInfoBo bo); + + /** + * 修改员工信息 + */ + Boolean updateByBo(WmsEmployeeInfoBo bo); + + /** + * 校验并批量删除员工信息信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java new file mode 100644 index 00000000..e4ce1b87 --- /dev/null +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsEmployeeInfoServiceImpl.java @@ -0,0 +1,122 @@ +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.WmsEmployeeInfoBo; +import com.klp.domain.vo.WmsEmployeeInfoVo; +import com.klp.domain.WmsEmployeeInfo; +import com.klp.mapper.WmsEmployeeInfoMapper; +import com.klp.service.IWmsEmployeeInfoService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 员工信息Service业务层处理 + * + * @author klp + * @date 2026-03-02 + */ +@RequiredArgsConstructor +@Service +public class WmsEmployeeInfoServiceImpl implements IWmsEmployeeInfoService { + + private final WmsEmployeeInfoMapper baseMapper; + + /** + * 查询员工信息 + */ + @Override + public WmsEmployeeInfoVo queryById(Long infoId){ + return baseMapper.selectVoById(infoId); + } + + /** + * 查询员工信息列表 + */ + @Override + public TableDataInfo queryPageList(WmsEmployeeInfoBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询员工信息列表 + */ + @Override + public List queryList(WmsEmployeeInfoBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(WmsEmployeeInfoBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.eq(bo.getSerialNumber() != null, WmsEmployeeInfo::getSerialNumber, bo.getSerialNumber()); + lqw.eq(StringUtils.isNotBlank(bo.getDept()), WmsEmployeeInfo::getDept, bo.getDept()); + lqw.eq(StringUtils.isNotBlank(bo.getJobType()), WmsEmployeeInfo::getJobType, bo.getJobType()); + lqw.like(StringUtils.isNotBlank(bo.getName()), WmsEmployeeInfo::getName, bo.getName()); + lqw.eq(StringUtils.isNotBlank(bo.getIdCard()), WmsEmployeeInfo::getIdCard, bo.getIdCard()); + lqw.eq(bo.getAge() != null, WmsEmployeeInfo::getAge, bo.getAge()); + lqw.eq(StringUtils.isNotBlank(bo.getGender()), WmsEmployeeInfo::getGender, bo.getGender()); + lqw.eq(StringUtils.isNotBlank(bo.getEducation()), WmsEmployeeInfo::getEducation, bo.getEducation()); + lqw.eq(StringUtils.isNotBlank(bo.getHomeAddress()), WmsEmployeeInfo::getHomeAddress, bo.getHomeAddress()); + lqw.eq(StringUtils.isNotBlank(bo.getPhone()), WmsEmployeeInfo::getPhone, bo.getPhone()); + lqw.eq(bo.getEntryTime() != null, WmsEmployeeInfo::getEntryTime, bo.getEntryTime()); + lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContact()), WmsEmployeeInfo::getEmergencyContact, bo.getEmergencyContact()); + lqw.eq(StringUtils.isNotBlank(bo.getRelationship()), WmsEmployeeInfo::getRelationship, bo.getRelationship()); + lqw.eq(StringUtils.isNotBlank(bo.getEmergencyContactPhone()), WmsEmployeeInfo::getEmergencyContactPhone, bo.getEmergencyContactPhone()); + return lqw; + } + + /** + * 新增员工信息 + */ + @Override + public Boolean insertByBo(WmsEmployeeInfoBo bo) { + WmsEmployeeInfo add = BeanUtil.toBean(bo, WmsEmployeeInfo.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setInfoId(add.getInfoId()); + } + return flag; + } + + /** + * 修改员工信息 + */ + @Override + public Boolean updateByBo(WmsEmployeeInfoBo bo) { + WmsEmployeeInfo update = BeanUtil.toBean(bo, WmsEmployeeInfo.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(WmsEmployeeInfo 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/WmsEmployeeInfoMapper.xml b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml new file mode 100644 index 00000000..82f4c682 --- /dev/null +++ b/klp-wms/src/main/resources/mapper/klp/WmsEmployeeInfoMapper.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +