From fbbfb006e1d745ca3b7ae9ef497c06da4128f380 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 22 四月 2026 17:58:05 +0800
Subject: [PATCH] 报告编制：印章生成调整
---
performance-server/src/main/java/com/ruoyi/performance/service/impl/StaffAttendanceTrackingRecordServiceImpl.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/performance-server/src/main/java/com/ruoyi/performance/service/impl/StaffAttendanceTrackingRecordServiceImpl.java b/performance-server/src/main/java/com/ruoyi/performance/service/impl/StaffAttendanceTrackingRecordServiceImpl.java
index d848646..f09e090 100644
--- a/performance-server/src/main/java/com/ruoyi/performance/service/impl/StaffAttendanceTrackingRecordServiceImpl.java
+++ b/performance-server/src/main/java/com/ruoyi/performance/service/impl/StaffAttendanceTrackingRecordServiceImpl.java
@@ -419,6 +419,9 @@
public void exportStaffAttendanceRecords(HttpServletResponse response, StaffAttendanceDTO staffAttendanceDTO) {
response.reset();
try{
+ //鏌ヨ浜哄憳鏋舵瀯
+ List<User> userList = userMapper.selectUserListByPerformance(false);
+ List<Integer> userIdList = userList.stream().map(User::getId).collect(Collectors.toList());
List<LocalDate> attendanceDateList = buildAttendanceDateList(staffAttendanceDTO);
//鎵规敞淇℃伅鍧愭爣淇℃伅
List<StaffAttendanceAnnotationTextExcelData> annotationTextList = new ArrayList<>();
@@ -430,7 +433,7 @@
//缁勮瀵煎嚭鏁版嵁
List<StaffAttendanceExcelData> excelData = new ArrayList<>();
Map<Integer, List<PerformanceShiftMapDto>> groupByUserId = performanceShifts.stream().collect(Collectors.groupingBy(PerformanceShiftMapDto::getUserId));
- List<Integer> userIdKeys = groupByUserId.keySet().stream().sorted().collect(Collectors.toList());
+ List<Integer> userIdKeys = groupByUserId.keySet().stream().sorted(Comparator.comparing(userIdList::indexOf)).collect(Collectors.toList());
for (int i = 0; i < userIdKeys.size(); i++) {
List<PerformanceShiftMapDto> shiftMapDtos = groupByUserId.get(userIdKeys.get(i));
StaffAttendanceExcelData attendanceExcelData = new StaffAttendanceExcelData();
--
Gitblit v1.9.3