From 51d7b5b62db52c8c80d0bac9d42c37e33ce48a5d Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 29 七月 2026 17:20:45 +0800
Subject: [PATCH] 1.手动下单：修复选择样品后查询的检测项缺失问题 2.人员考勤：修复同步ICC考勤数据报错问题
---
performance-server/src/main/java/com/ruoyi/performance/dto/PerformanceShiftMapDto.java | 20 ++++++++++++++++++--
1 files changed, 18 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 9a1fc71..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
@@ -12,6 +12,9 @@
@Data
public class PerformanceShiftMapDto extends PerformanceShift {
+ @ApiModelProperty("鐢ㄦ埛缂栧彿")
+ private String personCode;
+
@ApiModelProperty("鐢ㄦ埛鍚嶇О")
private String userName;
@@ -25,14 +28,27 @@
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<>();
@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