From 1fd52d7784a8b0b963cf38d63175cdf9082e8f43 Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期二, 03 十一月 2026 19:40:39 +0800
Subject: [PATCH] fix(hrm): 薪酬核算按出勤天数联动扣款、个税配置可保存、离职提交报错
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationSaveReqVO.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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..5c2cf34 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,12 @@
@NotNull(message = "鍩烘湰宸ヨ祫涓嶈兘涓虹┖")
private BigDecimal baseSalary;
+ @Schema(description = "宀椾綅宸ヨ祫")
+ private BigDecimal postSalary;
+
+ @Schema(description = "宸ラ緞宸ヨ祫")
+ private BigDecimal senioritySalary;
+
@Schema(description = "缁╂晥宸ヨ祫")
private BigDecimal performanceSalary;
@@ -55,6 +61,9 @@
@Schema(description = "鍏朵粬琛ヨ创")
private BigDecimal otherAllowance;
+
+ @Schema(description = "鍏ㄥ嫟濂�")
+ private BigDecimal fullAttendanceBonus;
@Schema(description = "绀句繚鎵ｉ櫎")
private BigDecimal socialSecurityDeduction;
@@ -72,9 +81,12 @@
@NotNull(message = "瀹炲彂宸ヨ祫涓嶈兘涓虹┖")
private BigDecimal actualSalary;
- @Schema(description = "鍑哄嫟澶╂暟")
+ @Schema(description = "搴斿嚭澶╂暟")
private Integer workDays;
+ @Schema(description = "瀹炲嚭澶╂暟")
+ private Integer actualDays;
+
@Schema(description = "鍔犵彮鏃堕暱")
private BigDecimal overtimeHours;
--
Gitblit v1.9.3