feat(Employee): add empType and empTypeName fields to Employee DTOs and entity

This commit is contained in:
2026-01-01 20:30:25 +08:00
parent a0ff080232
commit 463300d45d
5 changed files with 39 additions and 0 deletions

View File

@@ -67,6 +67,8 @@ public class DictCode {
public static final String EMP_STATUS = "emp.status";
public static final String EMP_TYPE = "emp.type";
public static final String EMP_SALARY_ITEM_CONFIG_TYPE = "emp.salary.item.config.type";
public static final String EXCEL_TEMPLATE_TYPE = "excel.template.type";

View File

@@ -99,6 +99,12 @@ public class EmployeeCalculateDto extends OrgCommonDto {
@DictTranslate(dictKey = DictCode.EMP_STATUS)
private String empStatusName;
@Comment("员工类型")
private String empType;
@DictTranslate(dictKey = DictCode.EMP_TYPE)
private String empTypeName;
@Comment("养老保险基数")
private Double insurance1Base;
@@ -182,6 +188,8 @@ public class EmployeeCalculateDto extends OrgCommonDto {
map.put("resignReason", this.resignReason);
map.put("empStatus", this.empStatus);
map.put("empStatusName", this.empStatusName);
map.put("empType", this.empType);
map.put("empTypeName", this.empTypeName);
map.put("insurance1Base", this.insurance1Base);
map.put("insurance1Percent", this.insurance1Percent);
map.put("insurance2Base", this.insurance2Base);

View File

@@ -122,6 +122,12 @@ public class EmployeeDto extends OrgCommonDto {
@DictTranslate(dictKey = DictCode.EMP_STATUS)
private String empStatusName;
@Comment("员工类型")
private String empType;
@DictTranslate(dictKey = DictCode.EMP_TYPE)
private String empTypeName;
@Comment("家庭成员")
private List<EmpFamilyMemberVO> familyMembers;

View File

@@ -103,6 +103,9 @@ public class EmployeeEntity extends OrgCommonEntity {
@Comment("员工状态")
private String empStatus;
@Comment("员工类型")
private String empType;
@ElementCollection
@Fetch(FetchMode.SUBSELECT)
private List<EmpFamilyMemberVO> familyMembers;

View File

@@ -2904,6 +2904,26 @@
"name": "布尔值"
}
]
},
{
"code": "emp.type",
"name": "员工类型",
"item": [
{
"code": "1",
"name": "正式员工"
},
{
"code": "2",
"name": "外包"
},
{
"code": "3",
"name": "临时工"
}
]
}