From f2c5864b2973e15959590eea78742a82085cd10d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 06 五月 2026 17:25:42 +0800
Subject: [PATCH] 人员考勤:应勤时长计算错误问题修复&奖惩记录导出调整

---
 performance-server/src/main/java/com/ruoyi/performance/dto/PerformanceShiftMapDto.java |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/performance-server/src/main/java/com/ruoyi/performance/dto/PerformanceShiftMapDto.java b/performance-server/src/main/java/com/ruoyi/performance/dto/PerformanceShiftMapDto.java
index 6af2f1e..8f88276 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/dto/PerformanceShiftMapDto.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/dto/PerformanceShiftMapDto.java
@@ -28,10 +28,13 @@
     private Integer monthNum;
 
     @ApiModelProperty("鏈堝害鐝缁熻")
-    private Map<String, Object> monthlyAttendance = new HashMap<>();
+    private Map<String, Long> monthlyAttendance = new HashMap<>();
+
+    @ApiModelProperty("鏈堝害鐝缁熻瀛楃涓�")
+    private String monthlyAttendanceStr;
 
     @ApiModelProperty("骞村害鐝缁熻")
-    private Map<String, Object> sidebarAnnualAttendance = new HashMap<>();;
+    private Map<String, Long> sidebarAnnualAttendance = new HashMap<>();;
 
     @ApiModelProperty("鐝璇︽儏")
     private List<PerformanceShiftMapDto> list = new ArrayList<>();

--
Gitblit v1.9.3