From ef1052e7bf9bf1765d61776bc49ce69a23c6cdee Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期二, 20 十月 2026 00:25:29 +0800
Subject: [PATCH] feat: 添加加班时长和加班工资字段到员工工资明细
---
src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
index 6cbe396..96709bf 100644
--- a/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
+++ b/src/main/java/com/ruoyi/staff/pojo/StaffSalaryDetail.java
@@ -56,6 +56,12 @@
@Schema(description = "璁℃椂宸ヨ祫")
private BigDecimal hourlySalary;
+ @Schema(description = "鍔犵彮鏃堕暱锛堝皬鏃讹級")
+ private BigDecimal overtimeHours;
+
+ @Schema(description = "鍔犵彮宸ヨ祫锛堟墜鍔ㄥ～鍐欙級")
+ private BigDecimal overtimePay;
+
@Schema(description = "鍏朵粬鏀跺叆")
private BigDecimal otherIncome;
@@ -68,15 +74,33 @@
@Schema(description = "鍏朵粬鏀嚭")
private BigDecimal otherDeduct;
+ @Schema(description = "绀句繚琛ョ即")
+ private BigDecimal socialSupplementAmount;
+
@Schema(description = "宸ヨ祫涓◣")
private BigDecimal salaryTax;
@Schema(description = "搴斿彂宸ヨ祫")
private BigDecimal grossSalary;
- @Schema(description = "搴旀墸宸ヨ祫")
+ @Schema(description = "搴旀墸绀句繚")
private BigDecimal deductSalary;
+ @Schema(description = "璇峰亣娆℃暟")
+ private Integer leaveCount;
+
+ @Schema(description = "缂哄嫟娆℃暟")
+ private Integer absenceCount;
+
+ @Schema(description = "杩熷埌娆℃暟")
+ private Integer lateCount;
+
+ @Schema(description = "鏃╅��娆℃暟")
+ private Integer earlyCount;
+
+ @Schema(description = "搴旀墸宸ヨ祫锛堟墜鍔ㄥ～鍐欙級")
+ private BigDecimal manualDeduct;
+
@Schema(description = "瀹炲彂宸ヨ祫")
private BigDecimal netSalary;
--
Gitblit v1.9.3