From 1702e168020f36627c7de0b145e7e4f67a0fb2e1 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期一, 20 四月 2026 17:08:09 +0800
Subject: [PATCH] 人员考勤导出排序调整
---
performance-server/src/main/java/com/ruoyi/performance/dto/PerformanceShiftMapDto.java | 41 ++++++++++++++++++++++++++++++++++-------
1 files changed, 34 insertions(+), 7 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..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
@@ -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,45 @@
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;
- private Map<String, Object> monthlyAttendance = new HashMap<>();
+ @ApiModelProperty("鏈堜唤搴忓垪")
+ private Integer monthNum;
- private Map<String, Object> sidebarAnnualAttendance = new HashMap<>();;
- private List<Map<String, Object>> list = new ArrayList<>();
+ @ApiModelProperty("鏈堝害鐝缁熻")
+ private Map<String, Long> monthlyAttendance = new HashMap<>();
+ @ApiModelProperty("鏈堝害鐝缁熻瀛楃涓�")
+ private String monthlyAttendanceStr;
+
+ @ApiModelProperty("骞村害鐝缁熻")
+ private Map<String, Long> sidebarAnnualAttendance = new HashMap<>();;
+
+ @ApiModelProperty("鐝璇︽儏")
+ private List<PerformanceShiftMapDto> list = new ArrayList<>();
+
+ @ApiModelProperty("鏃ユ湡琛ㄥご鍒楄〃")
private List<Map<Object, Object>> headerList = new ArrayList<>();
+
+ @ApiModelProperty("鐝寮�濮嬫椂闂�")
+ private String startTime;
+
+ @ApiModelProperty("鐝缁撴潫鏃堕棿")
+ private String endTime;
+
+ @ApiModelProperty("鐝鍚嶇О")
+ private String shiftName;
+
}
--
Gitblit v1.9.3