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/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java
index 945b210..e69c5a5 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java
@@ -45,6 +45,14 @@
@ExcelProperty("鍩烘湰宸ヨ祫")
private BigDecimal baseSalary;
+ @Schema(description = "宀椾綅宸ヨ祫")
+ @ExcelProperty("宀椾綅宸ヨ祫")
+ private BigDecimal postSalary;
+
+ @Schema(description = "宸ラ緞宸ヨ祫")
+ @ExcelProperty("宸ラ緞宸ヨ祫")
+ private BigDecimal senioritySalary;
+
@Schema(description = "缁╂晥宸ヨ祫")
@ExcelProperty("缁╂晥宸ヨ祫")
private BigDecimal performanceSalary;
@@ -64,6 +72,10 @@
@Schema(description = "鍏朵粬琛ヨ创")
@ExcelProperty("鍏朵粬琛ヨ创")
private BigDecimal otherAllowance;
+
+ @Schema(description = "鍏ㄥ嫟濂�", example = "200.00")
+ @ExcelProperty("鍏ㄥ嫟濂�")
+ private BigDecimal fullAttendanceBonus;
@Schema(description = "绀句繚鎵ｉ櫎")
@ExcelProperty("绀句繚鎵ｉ櫎")
@@ -89,14 +101,22 @@
@ExcelProperty("瀹炲彂宸ヨ祫")
private BigDecimal actualSalary;
- @Schema(description = "鍑哄嫟澶╂暟")
- @ExcelProperty("鍑哄嫟澶╂暟")
+ @Schema(description = "搴斿嚭澶╂暟")
+ @ExcelProperty("搴斿嚭澶╂暟")
private Integer workDays;
+
+ @Schema(description = "瀹炲嚭澶╂暟锛堝彇鑷�冨嫟姹囨�伙級", example = "21")
+ @ExcelProperty("瀹炲嚭澶╂暟")
+ private Integer actualDays;
@Schema(description = "鍔犵彮鏃堕暱")
@ExcelProperty("鍔犵彮鏃堕暱")
private BigDecimal overtimeHours;
+ @Schema(description = "鎺掔彮鎬诲伐鏃�")
+ @ExcelProperty("鎺掔彮鎬诲伐鏃�")
+ private BigDecimal totalWorkHours;
+
@Schema(description = "鐘舵��")
@ExcelProperty(value = "鐘舵��", converter = DictConvert.class)
@DictFormat("hrm_salary_calculation_status")
--
Gitblit v1.9.3