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/excel/StaffSalaryExportData.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java b/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java
index c1f2725..b2986a2 100644
--- a/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java
+++ b/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java
@@ -32,6 +32,12 @@
@Excel(name = "璁℃椂宸ヨ祫")
private BigDecimal hourlySalary;
+ @Excel(name = "鍔犵彮鏃堕暱")
+ private BigDecimal overtimeHours;
+
+ @Excel(name = "鍔犵彮宸ヨ祫")
+ private BigDecimal overtimePay;
+
@Excel(name = "鍏朵粬鏀跺叆")
private BigDecimal otherIncome;
@@ -53,9 +59,24 @@
@Excel(name = "搴斿彂宸ヨ祫")
private BigDecimal grossSalary;
- @Excel(name = "搴旀墸宸ヨ祫")
+ @Excel(name = "搴旀墸绀句繚")
private BigDecimal deductSalary;
+ @Excel(name = "璇峰亣娆℃暟")
+ private Integer leaveCount;
+
+ @Excel(name = "缂哄嫟娆℃暟")
+ private Integer absenceCount;
+
+ @Excel(name = "杩熷埌娆℃暟")
+ private Integer lateCount;
+
+ @Excel(name = "鏃╅��娆℃暟")
+ private Integer earlyCount;
+
+ @Excel(name = "搴旀墸宸ヨ祫")
+ private BigDecimal manualDeduct;
+
@Excel(name = "瀹炲彂宸ヨ祫")
private BigDecimal netSalary;
--
Gitblit v1.9.3