From f2c5864b2973e15959590eea78742a82085cd10d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 06 五月 2026 17:25:42 +0800
Subject: [PATCH] 人员考勤：应勤时长计算错误问题修复&奖惩记录导出调整
---
cnas-personnel/src/main/java/com/ruoyi/personnel/excel/PersonRewardPunishmentRecordExcel.java | 19 +++++++++++--------
1 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/cnas-personnel/src/main/java/com/ruoyi/personnel/excel/PersonRewardPunishmentRecordExcel.java b/cnas-personnel/src/main/java/com/ruoyi/personnel/excel/PersonRewardPunishmentRecordExcel.java
index 46f48e6..d9c323e 100644
--- a/cnas-personnel/src/main/java/com/ruoyi/personnel/excel/PersonRewardPunishmentRecordExcel.java
+++ b/cnas-personnel/src/main/java/com/ruoyi/personnel/excel/PersonRewardPunishmentRecordExcel.java
@@ -6,27 +6,30 @@
@Data
public class PersonRewardPunishmentRecordExcel {
- @ExcelProperty("鍛樺伐缂栧彿")
+ @ExcelProperty(value = "鍛樺伐缂栧彿",index = 0)
private String account;
- @ExcelProperty("鍛樺伐濮撳悕")
+ @ExcelProperty(value = "鍛樺伐濮撳悕",index = 1)
private String userName;
- @ExcelProperty("濂栨儵鍚嶇О")
+ @ExcelProperty(value = "濂栨儵鍚嶇О",index = 2)
private String rewardPunishName;
- @ExcelProperty("濂栨儵鏃堕棿")
+ @ExcelProperty(value = "濂栨儵鏃堕棿",index = 3)
private String rewardPunishTime;
- @ExcelProperty("濂栨儵璁″垎")
+ @ExcelProperty(value = "濂栨儵璁″垎",index = 4)
private String rewardPunishScore;
- @ExcelProperty("濂栨儵閲戦")
+ @ExcelProperty(value = "濂栨儵閲戦",index = 5)
private String rewardPunishSum;
- @ExcelProperty("鍒涘缓浜�")
+ @ExcelProperty(value = "濂栨儵鍐呭",index = 6)
+ private String rewardPunishContent;
+
+ @ExcelProperty(value = "鍒涘缓浜�",index = 7)
private String createUserName;
- @ExcelProperty("鍒涘缓鏃堕棿")
+ @ExcelProperty(value = "鍒涘缓鏃堕棿",index = 8)
private String createTime;
}
--
Gitblit v1.9.3