feat(wms): 添加员工转正接口

- 在员工异动类型中新增转正选项(类型值为2)
- 更新数据库实体和业务对象中的异动类型定义
- 实现员工转正业务逻辑,包括状态验证和数据更新
- 添加转正API接口和相应的控制器方法
- 更新相关注释和文档以反映新的转正功能
- 修改Excel导出功能以支持转正类型的显示
This commit is contained in:
2026-03-18 10:53:14 +08:00
parent 9c11ce7c9d
commit f7fdc03b5b
6 changed files with 90 additions and 36 deletions

View File

@@ -31,15 +31,15 @@ public class WmsEmployeeChange extends BaseEntity {
*/
private Long infoId;
/**
* 异动类型0=入职1=离职
* 异动类型0=入职1=离职2=转正
*/
private Integer changeType;
/**
* 异动时间(入职/离职时间)
* 异动时间(入职/离职/转正时间)
*/
private Date changeTime;
/**
* 异动原因(离职必填,入职可选)
* 异动原因(离职必填,入职/转正可选)
*/
private String changeReason;
/**

View File

@@ -30,7 +30,7 @@ public class WmsEmployeeChangeBo extends BaseEntity {
private Long infoId;
/**
* 异动类型0=入职1=离职
* 异动类型0=入职1=离职2=转正
*/
private Integer changeType;

View File

@@ -36,23 +36,23 @@ public class WmsEmployeeChangeVo {
private Long infoId;
/**
* 异动类型0=入职1=离职
* 异动类型0=入职1=离职2=转正
*/
@ExcelProperty(value = "异动类型0=入职1=离职")
@ExcelProperty(value = "异动类型0=入职1=离职2=转正")
private Integer changeType;
/**
* 异动时间(入职/离职时间)
* 异动时间(入职/离职/转正时间)
*/
@ExcelProperty(value = "异动时间", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "入=职/离职时间")
@ExcelDictFormat(readConverterExp = "入=职/离职/转正时间")
private Date changeTime;
/**
* 异动原因(离职必填,入职可选)
* 异动原因(离职必填,入职/转正可选)
*/
@ExcelProperty(value = "异动原因", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "离=职必填,入职可选")
@ExcelDictFormat(readConverterExp = "离=职必填,入职/转正可选")
private String changeReason;
/**