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/salary/HrmSalaryCalculationDO.java | 127 ++++++++++++++++++++++++++++++++++++++++++
1 files changed, 126 insertions(+), 1 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java
index 6a10e56..9f158f5 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java
@@ -12,7 +12,7 @@
/**
* 钖叕鏍哥畻璁板綍 DO
*
- * @author 鑺嬮亾婧愮爜
+ * @author 瓒呯骇绠＄悊鍛�
*/
@TableName("hrm_salary_calculation")
@KeySequence("hrm_salary_calculation_seq")
@@ -51,6 +51,126 @@
* 閮ㄩ棬ID
*/
private Long deptId;
+
+ /**
+ * 鏍囧噯宸ヨ祫
+ */
+ private BigDecimal standardSalary;
+
+ /**
+ * 宀椾綅宸ヨ祫
+ */
+ private BigDecimal postSalary;
+
+ /**
+ * 鍔犵彮宸ヨ祫鏍囧噯锛堝厓/灏忔椂锛�
+ */
+ private BigDecimal overtimeHourlyRate;
+
+ /**
+ * 瀹夊叏鐜繚濂栨爣鍑�
+ */
+ private BigDecimal safetyAwardStandard;
+
+ /**
+ * 缁╂晥鏍囧噯
+ */
+ private BigDecimal performanceStandard;
+
+ /**
+ * 璁¤柂鍑哄嫟锛堝ぉ锛�
+ */
+ private BigDecimal paidAttendanceDays;
+
+ /**
+ * 鏍囧噯鍑哄嫟鏃堕暱锛堝皬鏃讹級
+ */
+ private BigDecimal standardWorkHours;
+
+ /**
+ * 娉曞畾鍋囨棩鏃堕暱锛堝皬鏃讹級
+ */
+ private BigDecimal legalHolidayHours;
+
+ /**
+ * 鏍囧噯鍑哄嫟宸ヨ祫
+ */
+ private BigDecimal standardAttendancePay;
+
+ /**
+ * 娉曞畾鍋囧伐璧�
+ */
+ private BigDecimal legalHolidayPay;
+
+ /**
+ * 瀹夊叏鐜繚濂�
+ */
+ private BigDecimal safetyAward;
+
+ /**
+ * 娴姩缁╂晥宸ヨ祫
+ */
+ private BigDecimal floatingPerformancePay;
+
+ /**
+ * 搴斾粯宸ヨ祫
+ */
+ private BigDecimal payableSalary;
+
+ /**
+ * 宸ラ緞宸ヨ祫
+ */
+ private BigDecimal seniorityPay;
+
+ /**
+ * 澶滅彮琛ュ姪
+ */
+ private BigDecimal nightShiftAllowance;
+
+ /**
+ * 瀛﹀巻琛ヨ创
+ */
+ private BigDecimal educationAllowance;
+
+ /**
+ * 浣撴
+ */
+ private BigDecimal healthCheckAllowance;
+
+ /**
+ * 浼樼鍛樺伐濂�
+ */
+ private BigDecimal excellentEmployeeAward;
+
+ /**
+ * 鍏朵粬琛ュ姪
+ */
+ private BigDecimal otherSubsidy;
+
+ /**
+ * 閮ㄩ棬缁╂晥
+ */
+ private BigDecimal deptPerformance;
+
+ /**
+ * 鍔犻」鍚堣
+ */
+ private BigDecimal additionTotal;
+
+ /**
+ * 婕忔墦鍗�
+ */
+ private BigDecimal missedPunchDeduction;
+
+ /**
+ * 杩熷埌鏃╅��
+ */
+ private BigDecimal lateEarlyDeduction;
+
+ /**
+ * 鎵ｆ鍚堣
+ */
+ private BigDecimal deductionTotal;
/**
* 鍩烘湰宸ヨ祫
@@ -123,6 +243,11 @@
private BigDecimal overtimeHours;
/**
+ * 鎺掔彮鎬诲伐鏃讹紙灏忔椂锛�
+ */
+ private BigDecimal totalWorkHours;
+
+ /**
* 鐘舵�侊細0-寰呯‘璁わ紝10-宸茬‘璁わ紝20-宸插彂鏀�
*/
private Integer status;
--
Gitblit v1.9.3