From dc7300e21fe53f74e08eb2fa494a83430e2e54ca Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 26 三月 2026 11:25:58 +0800
Subject: [PATCH] 绩效管理:人员考勤功能模块

---
 performance-server/src/main/java/com/ruoyi/performance/dto/PerformanceShiftMapDto.java |   31 ++++++++++++++++++++++++++-----
 1 files changed, 26 insertions(+), 5 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 1405d71..adf7a1b 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
@@ -1,5 +1,7 @@
 package com.ruoyi.performance.dto;
 
+import com.ruoyi.performance.pojo.PerformanceShift;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.ArrayList;
@@ -8,20 +10,39 @@
 import java.util.Map;
 
 @Data
-public class PerformanceShiftMapDto {
+public class PerformanceShiftMapDto extends PerformanceShift {
 
-    private String name;
+    @ApiModelProperty("鐢ㄦ埛缂栧彿")
+    private String personCode;
 
+    @ApiModelProperty("鐢ㄦ埛鍚嶇О")
+    private String userName;
+
+    @ApiModelProperty("鐝")
     private String shiftTime;
 
-    private String userId;
-
+    @ApiModelProperty("閮ㄩ棬")
     private String department;
 
+    @ApiModelProperty("鏈堜唤搴忓垪")
+    private Integer monthNum;
+
+    @ApiModelProperty("鏈堝害鐝缁熻")
     private Map<String, Object> monthlyAttendance = new HashMap<>();
 
+    @ApiModelProperty("骞村害鐝缁熻")
     private Map<String, Object> sidebarAnnualAttendance = new HashMap<>();;
-    private List<Map<String, Object>> list = new ArrayList<>();
 
+    @ApiModelProperty("鐝璇︽儏")
+    private List<PerformanceShiftMapDto> list = new ArrayList<>();
+
+    @ApiModelProperty("鏃ユ湡琛ㄥご鍒楄〃")
     private List<Map<Object, Object>> headerList = new ArrayList<>();
+
+    @ApiModelProperty("鐝寮�濮嬫椂闂�")
+    private String startTime;
+
+    @ApiModelProperty("鐝缁撴潫鏃堕棿")
+    private String endTime;
+
 }

--
Gitblit v1.9.3