From 1466672f09a4fc1037c78cc2bb096fca551c1683 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期三, 28 十月 2026 09:46:29 +0800
Subject: [PATCH] feat(hrm): 薪酬核算新增全勤奖与实出天数，修正实发工资口径
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/dal/dataobject/salary/HrmSalaryCalculationDO.java | 33 +++++++++++++++++++++++++++++++--
1 files changed, 31 insertions(+), 2 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..cc83d1c 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")
@@ -58,6 +58,16 @@
private BigDecimal baseSalary;
/**
+ * 宀椾綅宸ヨ祫
+ */
+ private BigDecimal postSalary;
+
+ /**
+ * 宸ラ緞宸ヨ祫
+ */
+ private BigDecimal senioritySalary;
+
+ /**
* 缁╂晥宸ヨ祫
*/
private BigDecimal performanceSalary;
@@ -81,6 +91,12 @@
* 鍏朵粬琛ヨ创
*/
private BigDecimal otherAllowance;
+ /**
+ * 鍏ㄥ嫟濂�
+ *
+ * 涓庡叾浠栨触璐翠竴鑷达紝鐢变汉宸ュ湪鏍哥畻鍗曚腑缁存姢锛岄粯璁� 0
+ */
+ private BigDecimal fullAttendanceBonus;
/**
* 绀句繚鎵ｉ櫎
@@ -113,9 +129,17 @@
private BigDecimal actualSalary;
/**
- * 鍑哄嫟澶╂暟
+ * 搴斿嚭澶╂暟锛堟寜鎺掔彮绱鐨勫簲鍑哄嫟澶╂暟锛屾棤鎺掔彮鏃跺洖閫� 22锛�
*/
private Integer workDays;
+
+ /**
+ * 瀹炲嚭澶╂暟
+ *
+ * 鍙栬嚜鑰冨嫟姹囨�伙紙hrm_attendance_summary.actual_days锛夛紝鏃犳眹鎬昏褰曟椂涓� 0銆�
+ * 璇存槑锛氬師銆屾帓鐝�诲伐鏃躲�嶅瓧娈典繚鐣欎絾涓嶅啀浣跨敤锛堝巻鍙叉暟鎹笉鍒犻櫎锛夈��
+ */
+ private Integer actualDays;
/**
* 鍔犵彮鏃堕暱
@@ -123,6 +147,11 @@
private BigDecimal overtimeHours;
/**
+ * 鎺掔彮鎬诲伐鏃讹紙灏忔椂锛�
+ */
+ private BigDecimal totalWorkHours;
+
+ /**
* 鐘舵�侊細0-寰呯‘璁わ紝10-宸茬‘璁わ紝20-宸插彂鏀�
*/
private Integer status;
--
Gitblit v1.9.3