Skip to content

WEB - 업체별 통계 월별 그래프 조회 범위 수정 #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
devJeenee merged 1 commit into from
May 13, 2025
Merged

WEB - 업체별 통계 월별 그래프 조회 범위 수정 #339

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions ...web/statistic/infrastructure/repository/monthly/MonthlyStatisticRepositoryCustomImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,15 @@ public MonthlyStatisticEntity findByBizIdAndDate(Long bizId, LocalDate date) {
* 월별 운행량 그래프 데이터 조회
*
* @param bizId
* @param currentDate
* @param targetDate targetDate BETWEEN currentDate 기간 조회
* @param currentDate Controller에서 받은 YearMonth의 atDay(1), 즉 yyyy-MM-01 형식의 값
* @param targetDate 마찬가지로 yyyy-MM-01 형식의 값
* @return
*/
@Override
public List<MonthlyStatisticResponse.MonthlyStats> getMonthlyStats(Long bizId, LocalDate currentDate,
LocalDate targetDate) {
LocalDate endDate = currentDate.with(TemporalAdjusters.lastDayOfMonth());

return queryFactory
.select(
Projections.constructor(
Expand All @@ -70,7 +72,7 @@ public List<MonthlyStatisticResponse.MonthlyStats> getMonthlyStats(Long bizId, L
.from(monthlyStatisticEntity)
.where(
monthlyStatisticEntity.bizId.eq(bizId)
.and(monthlyStatisticEntity.date.between(targetDate, currentDate))
.and(monthlyStatisticEntity.date.between(targetDate, endDate))
)
.groupBy(monthlyStatisticEntity.date.yearMonth())
.orderBy(monthlyStatisticEntity.date.yearMonth().asc())
Expand Down