From f81b963f9d1b7d4757446970830cb72264c6dc0c Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 04 十一月 2026 15:18:57 +0800
Subject: [PATCH] 九鸿：工资表按客户口径重构 + 修复考勤汇总生成、新增节假日报错
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 120 insertions(+), 0 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 2f19cc4..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
@@ -53,6 +53,126 @@
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;
+
+ /**
* 鍩烘湰宸ヨ祫
*/
private BigDecimal baseSalary;
--
Gitblit v1.9.3