Compare commits

..

No commits in common. "5d33a18890e0f4a7ed12044a78b2c08f8b242764" and "96186a1a506add0d48a1849c77668e4e9cf8e3e0" have entirely different histories.

2 changed files with 12 additions and 13 deletions

View File

@ -14,9 +14,8 @@ import java.time.LocalDateTime
@Repository
class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
fun getAdStatisticsDataTotalCount(): Int {
return (
queryFactory
.select(adTrackingHistory.id.pid.count())
return queryFactory
.select(adTrackingHistory.id.pid)
.from(adTrackingHistory)
.groupBy(
getFormattedDate(adTrackingHistory.id.createdAt),
@ -24,8 +23,8 @@ class AdminAdStatisticsRepository(private val queryFactory: JPAQueryFactory) {
adTrackingHistory.id.pid,
adTrackingHistory.pidName
)
.fetchOne() ?: 0L
).toInt()
.fetch()
.size
}
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.desc())
.orderBy(adMediaPartner.isActive.desc(), adMediaPartner.id.asc())
.offset(offset)
.limit(limit)
.fetch()