From 7cce9e212894b69f5539d768bfd372360df05904 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 28 四月 2026 16:39:40 +0800
Subject: [PATCH] 合格率统计调整：不合格处理OA状态为退回的不纳入合格率统计
---
performance-server/src/main/java/com/ruoyi/performance/dto/PerformanceShiftMapDto.java | 10 ++++++++--
1 files changed, 8 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 adf7a1b..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<>();
@@ -45,4 +48,7 @@
@ApiModelProperty("鐝缁撴潫鏃堕棿")
private String endTime;
+ @ApiModelProperty("鐝鍚嶇О")
+ private String shiftName;
+
}
--
Gitblit v1.9.3