From 260a077e52b9d508901f3bcf4d237b0443004464 Mon Sep 17 00:00:00 2001 From: yeondub1121 Date: Fri, 21 Feb 2025 11:54:49 +0900 Subject: [PATCH] =?UTF-8?q?Fix:=20=EB=A6=AC=ED=8F=AC=ED=8A=B8=20=EC=97=90?= =?UTF-8?q?=EB=9F=AC=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/habitService/HabitReportService.java | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/Spring/MindStone/service/habitService/HabitReportService.java b/src/main/java/Spring/MindStone/service/habitService/HabitReportService.java index aae1222..2e72897 100644 --- a/src/main/java/Spring/MindStone/service/habitService/HabitReportService.java +++ b/src/main/java/Spring/MindStone/service/habitService/HabitReportService.java @@ -6,6 +6,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.math.BigDecimal; import java.util.List; import java.util.stream.Collectors; @@ -46,16 +47,14 @@ public HabitReportResponseDto getHabitReport(Long memberId, int year, int month) // 주별 활동 횟수 List weeklyHabitCountsData = habitHistoryRepository.getWeeklyHabitCounts(memberId, year, month); List weeklyHabitCounts = weeklyHabitCountsData.stream() - .map(data -> { - int week = data[0] != null ? ((Number) data[0]).intValue() : 0; // 주차 - long habitId = data[1] != null ? ((Number) data[1]).longValue() : 0L; // 습관 ID - long count = data[2] != null ? ((Number) data[2]).longValue() : 0L; // 활동 횟수 + .map(data -> new HabitReportResponseDto.WeeklyData( + ((Number) data[0]).intValue(), + ((Number) data[1]).longValue(), + ((BigDecimal) data[2]).longValue() + )) - return new HabitReportResponseDto.WeeklyData(week, habitId, count); - }) .collect(Collectors.toList()); - return new HabitReportResponseDto(recordPercentage, achievementGrowth, topHabit, weeklyAchievementRates, weeklyActiveTime,weeklyHabitCounts); } }