From fa4a310bb94f41bdc7af068bd380fdfeafb881c7 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期一, 26 十月 2026 14:14:20 +0800
Subject: [PATCH] feat(hrm): 薪酬核算新增「岗位工资」「工龄工资」
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java | 50 ++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 46 insertions(+), 4 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java
index e7d77ab..c392349 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java
@@ -12,7 +12,7 @@
/**
* 鍛樺伐淇℃伅 DO
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@TableName("hrm_employee")
@KeySequence("hrm_employee_seq")
@@ -45,11 +45,11 @@
private Long deptId;
/**
- * 宀椾綅ID
+ * 宀椾綅ID鍒楄〃
*
- * 鍏宠仈 PostDO#getId()
+ * 鍏宠仈 PostDO#getId()锛孞SON 鏍煎紡瀛樺偍
*/
- private Long postId;
+ private String postIds;
/**
* 鍛樺伐缂栧彿
@@ -89,6 +89,31 @@
private String idCard;
/**
+ * 姘戞棌
+ */
+ private String nation;
+
+ /**
+ * 濠氬Щ鐘舵��
+ */
+ private String marriageStatus;
+
+ /**
+ * 骞撮緞
+ */
+ private Integer age;
+
+ /**
+ * 瀛﹀巻
+ */
+ private String education;
+
+ /**
+ * 鏀挎不闈㈣矊
+ */
+ private String politicalStatus;
+
+ /**
* 鍏ヨ亴鏃ユ湡
*/
private LocalDate hireDate;
@@ -109,6 +134,13 @@
* 1-鍦ㄨ亴锛�2-璇曠敤锛�3-绂昏亴
*/
private Integer employeeStatus;
+
+ /**
+ * 鍛樺伐绫诲埆
+ *
+ * 1-鏅�氬憳宸ワ紝2-鎶�宸ワ紝3-绠＄悊锛涚敤浜庡姞鐝伐璧勫樊寮傚寲鏍哥畻
+ */
+ private Integer employeeCategory;
/**
* 骞村亣浣欓锛堝ぉ锛�
@@ -135,6 +167,16 @@
private BigDecimal baseSalary;
/**
+ * 宀椾綅宸ヨ祫
+ */
+ private BigDecimal postSalary;
+
+ /**
+ * 宸ラ緞宸ヨ祫
+ */
+ private BigDecimal senioritySalary;
+
+ /**
* 瑙掕壊ID鍒楄〃
*
* 鐢ㄤ簬鍒嗛厤绯荤粺鐢ㄦ埛瑙掕壊锛孞SON 鏍煎紡瀛樺偍
--
Gitblit v1.9.3