From 211d2887af4608fbdfd40af1e16e4f58131dfaa2 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 28 八月 2026 23:08:54 +0800
Subject: [PATCH] feat: 添加清除当前用户的所有消息接口
---
src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java | 39 ++++++++++++++++++++++++---------------
1 files changed, 24 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java b/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java
index df8e82c..efc97ce 100644
--- a/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java
+++ b/src/main/java/com/ruoyi/staff/excel/StaffSalaryExportData.java
@@ -20,6 +20,9 @@
@Excel(name = "鍛樺伐濮撳悕")
private String staffName;
+ @Excel(name = "鍏ュ徃鏃ユ湡")
+ private String entryDate;
+
@Excel(name = "閮ㄩ棬鍚嶇О")
private String deptName;
@@ -29,30 +32,36 @@
@Excel(name = "鍏ㄥ嫟濂栭噾")
private BigDecimal attendanceBonus;
- @Excel(name = "璁′欢宸ヨ祫")
- private BigDecimal pieceSalary;
+ @Excel(name = "鏃ヨ宸ヨ祫")
+ private BigDecimal dailySalary;
- @Excel(name = "璁℃椂宸ヨ祫")
- private BigDecimal hourlySalary;
+ @Excel(name = "鍑哄嫟澶╂暟")
+ private Integer workDays;
- @Excel(name = "鏈堝伐浣滄棩澶╂暟")
- private Integer monthWorkDays;
-
- @Excel(name = "鏈堟爣鍑嗗伐鏃�")
- private BigDecimal standardHours;
+ @Excel(name = "鏁堢泭")
+ private BigDecimal conversionRatio;
@Excel(name = "鏈堟椂闂村悎璁�")
private BigDecimal monthTimeTotal;
- @Excel(name = "鎶樺悎鍊嶆暟")
- private BigDecimal conversionRatio;
-
- @Excel(name = "宸ュ簭鎶樼畻宸ユ椂")
- private BigDecimal convertedWorkHours;
-
@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