Joshi
f7fdc03b5b
- 在员工异动类型中新增转正选项（类型值为2） - 更新数据库实体和业务对象中的异动类型定义 - 实现员工转正业务逻辑，包括状态验证和数据更新 - 添加转正API接口和相应的控制器方法 - 更新相关注释和文档以反映新的转正功能 - 修改Excel导出功能以支持转正类型的显示
83 lines
1.9 KiB
Java
83 lines
1.9 KiB
Java
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;
|
||
|
||
|
||
/**
|
||
* 员工异动（入职/离职）视图对象 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=离职，2=转正
|
||
*/
|
||
@ExcelProperty(value = "异动类型：0=入职，1=离职，2=转正")
|
||
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;
|
||
/**
|
||
* 员工信息
|
||
*/
|
||
private WmsEmployeeInfo wmsEmployeeInfo;
|
||
|
||
|
||
|
||
}
|