From 70a0b21595941890a9d26cfde01ff17e3427214a Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期四, 23 七月 2026 09:24:41 +0800
Subject: [PATCH] 修改工资计算
---
src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java | 18 ++++++++++++++++++
1 files changed, 18 insertions(+), 0 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..df8e82c 100644
--- a/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java
+++ b/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java
@@ -26,12 +26,30 @@
@Excel(name = "鍩烘湰宸ヨ祫")
private BigDecimal basicSalary;
+ @Excel(name = "鍏ㄥ嫟濂栭噾")
+ private BigDecimal attendanceBonus;
+
@Excel(name = "璁′欢宸ヨ祫")
private BigDecimal pieceSalary;
@Excel(name = "璁℃椂宸ヨ祫")
private BigDecimal hourlySalary;
+ @Excel(name = "鏈堝伐浣滄棩澶╂暟")
+ private Integer monthWorkDays;
+
+ @Excel(name = "鏈堟爣鍑嗗伐鏃�")
+ private BigDecimal standardHours;
+
+ @Excel(name = "鏈堟椂闂村悎璁�")
+ private BigDecimal monthTimeTotal;
+
+ @Excel(name = "鎶樺悎鍊嶆暟")
+ private BigDecimal conversionRatio;
+
+ @Excel(name = "宸ュ簭鎶樼畻宸ユ椂")
+ private BigDecimal convertedWorkHours;
+
@Excel(name = "鍏朵粬鏀跺叆")
private BigDecimal otherIncome;
--
Gitblit v1.9.3