Compare commits

..

No commits in common. "48677a5a246af3262f67d024f47bd143d731706c" and "925c5203be1db2e575339c5f08a47bcefe6882a7" have entirely different histories.

2 changed files with 12 additions and 13 deletions

View File

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

View File

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