From 377a567e83d410cdbc75edd3fe69fdc28bf5a5b1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 28 八月 2026 23:09:05 +0800
Subject: [PATCH] fix(sales): 统一调整日期序列化时区为GMT+8
---
src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 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..efc97ce 100644
--- a/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java
+++ b/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java
@@ -20,21 +20,48 @@
@Excel(name = "鍛樺伐濮撳悕")
private String staffName;
+ @Excel(name = "鍏ュ徃鏃ユ湡")
+ private String entryDate;
+
@Excel(name = "閮ㄩ棬鍚嶇О")
private String deptName;
@Excel(name = "鍩烘湰宸ヨ祫")
private BigDecimal basicSalary;
- @Excel(name = "璁′欢宸ヨ祫")
- private BigDecimal pieceSalary;
+ @Excel(name = "鍏ㄥ嫟濂栭噾")
+ private BigDecimal attendanceBonus;
- @Excel(name = "璁℃椂宸ヨ祫")
- private BigDecimal hourlySalary;
+ @Excel(name = "鏃ヨ宸ヨ祫")
+ private BigDecimal dailySalary;
+
+ @Excel(name = "鍑哄嫟澶╂暟")
+ private Integer workDays;
+
+ @Excel(name = "鏁堢泭")
+ private BigDecimal conversionRatio;
+
+ @Excel(name = "鏈堟椂闂村悎璁�")
+ private BigDecimal monthTimeTotal;
@Excel(name = "鍏朵粬鏀跺叆")
private BigDecimal otherIncome;
+ @Excel(name = "浜嬪亣")
+ private BigDecimal personalLeave;
+
+ @Excel(name = "鐥呭亣")
+ private BigDecimal sickLeave;
+
+ @Excel(name = "涓у亣")
+ private BigDecimal bereavementLeave;
+
+ @Excel(name = "濠氬亣")
+ private BigDecimal marriageLeave;
+
+ @Excel(name = "娲ヨ创")
+ private BigDecimal allowance;
+
@Excel(name = "绀句繚涓汉")
private BigDecimal socialPersonal;
--
Gitblit v1.9.3