Merge pull request 'test' (#281) from test into main

Reviewed-on: #281
This commit is contained in:
klaus 2025-03-10 05:35:30 +00:00
commit 5d33a18890
2 changed files with 13 additions and 12 deletions

View File

@ -14,8 +14,9 @@ import java.time.LocalDateTime
@Repository
class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
fun getAdStatisticsDataTotalCount(): Int {
return queryFactory
.select(adTrackingHistory.id.pid)
return (
queryFactory
.select(adTrackingHistory.id.pid.count())
.from(adTrackingHistory)
.groupBy(
getFormattedDate(adTrackingHistory.id.createdAt),
@ -23,8 +24,8 @@ class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
adTrackingHistory.id.pid,
adTrackingHistory.pidName
)
.fetch()
.size
.fetchOne() ?: 0L
).toInt()
}
fun getAdStatisticsDataList(offset: Long, limit: Long): List<GetAdminAdStatisticsItem> {

View File

@ -45,7 +45,7 @@ class AdMediaPartnerQueryRepositoryImpl(private val queryFactory: JPAQueryFactor
)
)
.from(adMediaPartner)
.orderBy(adMediaPartner.isActive.desc(), adMediaPartner.id.asc())
.orderBy(adMediaPartner.isActive.desc(), adMediaPartner.id.desc())
.offset(offset)
.limit(limit)
.fetch()