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/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java | 72 ++++++++++++++++++++++++++++++++++++
1 files changed, 72 insertions(+), 0 deletions(-)
diff --git a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java
index 550c6c9..fe9aba6 100644
--- a/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java
+++ b/yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java
@@ -41,6 +41,78 @@
@NotNull(message = "鍩烘湰宸ヨ祫涓嶈兘涓虹┖")
private BigDecimal baseSalary;
+ @Schema(description = "鏍囧噯宸ヨ祫")
+ private BigDecimal standardSalary;
+
+ @Schema(description = "宀椾綅宸ヨ祫")
+ private BigDecimal postSalary;
+
+ @Schema(description = "鍔犵彮宸ヨ祫鏍囧噯锛堝厓/灏忔椂锛�")
+ private BigDecimal overtimeHourlyRate;
+
+ @Schema(description = "瀹夊叏鐜繚濂栨爣鍑�")
+ private BigDecimal safetyAwardStandard;
+
+ @Schema(description = "缁╂晥鏍囧噯")
+ private BigDecimal performanceStandard;
+
+ @Schema(description = "璁¤柂鍑哄嫟锛堝ぉ锛�")
+ private BigDecimal paidAttendanceDays;
+
+ @Schema(description = "鏍囧噯鍑哄嫟鏃堕暱锛堝皬鏃讹級")
+ private BigDecimal standardWorkHours;
+
+ @Schema(description = "娉曞畾鍋囨棩鏃堕暱锛堝皬鏃讹級")
+ private BigDecimal legalHolidayHours;
+
+ @Schema(description = "鏍囧噯鍑哄嫟宸ヨ祫")
+ private BigDecimal standardAttendancePay;
+
+ @Schema(description = "娉曞畾鍋囧伐璧�")
+ private BigDecimal legalHolidayPay;
+
+ @Schema(description = "瀹夊叏鐜繚濂�")
+ private BigDecimal safetyAward;
+
+ @Schema(description = "娴姩缁╂晥宸ヨ祫")
+ private BigDecimal floatingPerformancePay;
+
+ @Schema(description = "搴斾粯宸ヨ祫")
+ private BigDecimal payableSalary;
+
+ @Schema(description = "宸ラ緞宸ヨ祫")
+ private BigDecimal seniorityPay;
+
+ @Schema(description = "澶滅彮琛ュ姪")
+ private BigDecimal nightShiftAllowance;
+
+ @Schema(description = "瀛﹀巻琛ヨ创")
+ private BigDecimal educationAllowance;
+
+ @Schema(description = "浣撴")
+ private BigDecimal healthCheckAllowance;
+
+ @Schema(description = "浼樼鍛樺伐濂�")
+ private BigDecimal excellentEmployeeAward;
+
+ @Schema(description = "鍏朵粬琛ュ姪")
+ private BigDecimal otherSubsidy;
+
+ @Schema(description = "閮ㄩ棬缁╂晥")
+ private BigDecimal deptPerformance;
+
+ @Schema(description = "鍔犻」鍚堣")
+ private BigDecimal additionTotal;
+
+ @Schema(description = "婕忔墦鍗�")
+ private BigDecimal missedPunchDeduction;
+
+ @Schema(description = "杩熷埌鏃╅��")
+ private BigDecimal lateEarlyDeduction;
+
+ @Schema(description = "鎵ｆ鍚堣")
+ private BigDecimal deductionTotal;
+
@Schema(description = "缁╂晥宸ヨ祫")
private BigDecimal performanceSalary;
--
Gitblit v1.9.3