考勤汇总导出时员工当天有多条请假记录导致导出记录假期描述不准确bug修改

attendance-performance-manager/src/main/java/com/mortals/xhx/module/attendance/web/AttendanceStatController.java

@@ -219,7 +219,16 @@ public class AttendanceStatController extends BaseCRUDJsonBodyMappingController<
                 List<AttendanceStaffStatEntity> attendanceStaffStatEntities = item.getAttendanceStaffStatEntities();
                 Map<Integer, String> collect = new HashMap<>();
                 if (!ObjectUtils.isEmpty(attendanceStaffStatEntities)) {
-                    collect = attendanceStaffStatEntities.stream().collect(Collectors.toMap(x -> x.getYear() + x.getMonth() + x.getDay(), y -> y.getAttendanceSummary(),(o,n)->n));
+                    for(AttendanceStaffStatEntity staffStat:attendanceStaffStatEntities){
+                        Integer key = staffStat.getYear() + staffStat.getMonth() + staffStat.getDay();
+                        if(collect.containsKey(key)){
+                            String value = collect.get(key)+";"+staffStat.getAttendanceSummary();
+                            collect.put(key,value);
+                        }else {
+                            collect.put(key,staffStat.getAttendanceSummary());
+                        }
+                    }
+                    //collect = attendanceStaffStatEntities.stream().collect(Collectors.toMap(x -> x.getYear() + x.getMonth() + x.getDay(), y -> y.getAttendanceSummary(),(o,n)->n));
                 }
                 List<Map<String, Object>> mapList = new ArrayList<>();
                 for (int i = 0; i <= subDay.intValue(); i++) {