From fe4a5c78dc6c4e21e57d9652be9d4a42dccf0ca1 Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期四, 05 十一月 2026 20:29:07 +0800
Subject: [PATCH] fix(hrm): 考勤异常申请字段匹配与申请人回填；补充 hrm_audit_status 字典脚本
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/employee/HrmEmployeeDO.java | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 56 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..26849d0 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;
/**
* 鍛樺伐缂栧彿
@@ -87,6 +87,31 @@
* 韬唤璇佸彿
*/
private String idCard;
+
+ /**
+ * 姘戞棌
+ */
+ private String nation;
+
+ /**
+ * 濠氬Щ鐘舵��
+ */
+ private String marriageStatus;
+
+ /**
+ * 骞撮緞
+ */
+ private Integer age;
+
+ /**
+ * 瀛﹀巻
+ */
+ private String education;
+
+ /**
+ * 鏀挎不闈㈣矊
+ */
+ private String politicalStatus;
/**
* 鍏ヨ亴鏃ユ湡
@@ -135,6 +160,33 @@
private BigDecimal baseSalary;
/**
+ * 鏍囧噯宸ヨ祫
+ *
+ * 鐢ㄤ簬宸ヨ祫琛細鏍囧噯鍑哄嫟宸ヨ祫 = 鏍囧噯宸ヨ祫 梅 鏍囧噯鍑哄嫟澶╂暟 脳 璁¤柂鍑哄嫟
+ */
+ private BigDecimal standardSalary;
+
+ /**
+ * 宀椾綅宸ヨ祫
+ */
+ private BigDecimal postSalary;
+
+ /**
+ * 鍔犵彮宸ヨ祫鏍囧噯锛堝厓/灏忔椂锛�
+ */
+ private BigDecimal overtimeHourlyRate;
+
+ /**
+ * 瀹夊叏鐜繚濂栨爣鍑�
+ */
+ private BigDecimal safetyAwardStandard;
+
+ /**
+ * 缁╂晥鏍囧噯
+ */
+ private BigDecimal performanceStandard;
+
+ /**
* 瑙掕壊ID鍒楄〃
*
* 鐢ㄤ簬鍒嗛厤绯荤粺鐢ㄦ埛瑙掕壊锛孞SON 鏍煎紡瀛樺偍
--
Gitblit v1.9.3