feat(wms): 新增员工入职离职功能
- 在 IWmsEmployeeChangeService 中添加 employeeEntry 和 employeeLeave 方法 - 扩展 WmsEmployeeChangeBo 类增加员工详细信息字段 - 在 WmsEmployeeChangeController 中添加入职和离职接口 - 实现 WmsEmployeeChangeServiceImpl 的入职离职业务逻辑 - 集成员工信息查询功能并在查询结果中关联员工详情 - 添加事务管理确保数据一致性操作
This commit is contained in:
@@ -59,5 +59,84 @@ public class WmsEmployeeChangeBo extends BaseEntity {
|
||||
*/
|
||||
private String remark;
|
||||
|
||||
/**
|
||||
* 序号
|
||||
*/
|
||||
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 socialInsuranceType;
|
||||
|
||||
// infoRemart
|
||||
private String infoRemark;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
@@ -1,11 +1,13 @@
|
||||
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 com.klp.domain.WmsEmployeeInfo;
|
||||
import lombok.Data;
|
||||
|
||||
|
||||
@@ -70,6 +72,11 @@ public class WmsEmployeeChangeVo {
|
||||
*/
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
/**
|
||||
* 员工信息
|
||||
*/
|
||||
private WmsEmployeeInfo wmsEmployeeInfo;
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user