klaus
/
sodalive-backend-spring-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

test #88

Merged
klaus merged 3 commits from test into main 2023-11-14 11:09:14 +00:00
Conversation 0 Commits 3 Files Changed 1 +2 -2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 68c2b505bb - Show all commits

4
src/main/kotlin/kr/co/vividnext/sodalive/admin/calculate/AdminCalculateQueryRepository.kt
View File

@ -138,7 +138,7 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
getFormattedDate(audioContent.createdAt), getFormattedDate(audioContent.createdAt),
donationFormattedDate, donationFormattedDate,
useCan.id.count(), useCan.id.count(),
useCan.can.add(useCan.rewardCan).sum() useCanCalculate.can.sum()
) )
) )
.from(useCanCalculate) .from(useCanCalculate)
@ -152,7 +152,7 @@ class AdminCalculateQueryRepository(private val queryFactory: JPAQueryFactory) {
.and(useCan.createdAt.goe(startDate)) .and(useCan.createdAt.goe(startDate))
.and(useCan.createdAt.loe(endDate)) .and(useCan.createdAt.loe(endDate))
) )
.groupBy(donationFormattedDate, audioContent.id) .groupBy(donationFormattedDate, audioContent.id, useCan.id)
.orderBy(member.id.asc(), donationFormattedDate.desc()) .orderBy(member.id.asc(), donationFormattedDate.desc())
.fetch() .fetch()
} }