From 1d372d5e4916eaecf9b773e52e0d887d4fd0e47a Mon Sep 17 00:00:00 2001
From: tuqin <tuqin@tuqin.cn>
Date: 星期四, 05 十一月 2026 15:02:27 +0800
Subject: [PATCH] fix(hrm): 社保扣款在员工未加社保时误扣、两方案扣款相同
---
yudao-module-hrm/src/main/java/cn/iocoder/yudao/module/hrm/controller/admin/salary/vo/HrmSalaryCalculationRespVO.java | 12 ++++++++++--
1 files changed, 10 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 1383e02..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
@@ -73,6 +73,10 @@
@ExcelProperty("鍏朵粬琛ヨ创")
private BigDecimal otherAllowance;
+ @Schema(description = "鍏ㄥ嫟濂�", example = "200.00")
+ @ExcelProperty("鍏ㄥ嫟濂�")
+ private BigDecimal fullAttendanceBonus;
+
@Schema(description = "绀句繚鎵ｉ櫎")
@ExcelProperty("绀句繚鎵ｉ櫎")
private BigDecimal socialSecurityDeduction;
@@ -97,10 +101,14 @@
@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;
--
Gitblit v1.9.3