parent
3a180d478c
commit
b817a230fd
|
@ -44,12 +44,12 @@ class AdminMemberStatisticsRepository(private val queryFactory: JPAQueryFactory)
|
||||||
.select(
|
.select(
|
||||||
QDateAndMemberCount(
|
QDateAndMemberCount(
|
||||||
getFormattedDate(charge.createdAt),
|
getFormattedDate(charge.createdAt),
|
||||||
member.id.countDistinct().castToNum(Int::class.java)
|
Expressions.numberTemplate(Int::class.java, "COUNT(DISTINCT {0})", member.id)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.from(charge)
|
.from(charge)
|
||||||
.innerJoin(charge.member, member)
|
.innerJoin(charge.member, member)
|
||||||
.leftJoin(charge.payment, payment)
|
.innerJoin(charge.payment, payment)
|
||||||
.where(
|
.where(
|
||||||
charge.status.eq(ChargeStatus.CHARGE),
|
charge.status.eq(ChargeStatus.CHARGE),
|
||||||
payment.status.eq(PaymentStatus.COMPLETE),
|
payment.status.eq(PaymentStatus.COMPLETE),
|
||||||
|
@ -119,12 +119,12 @@ class AdminMemberStatisticsRepository(private val queryFactory: JPAQueryFactory)
|
||||||
.select(
|
.select(
|
||||||
QDateAndMemberCount(
|
QDateAndMemberCount(
|
||||||
getFormattedDate(charge.createdAt),
|
getFormattedDate(charge.createdAt),
|
||||||
member.id.countDistinct().castToNum(Int::class.java)
|
Expressions.numberTemplate(Int::class.java, "COUNT(DISTINCT {0})", member.id)
|
||||||
)
|
)
|
||||||
)
|
)
|
||||||
.from(charge)
|
.from(charge)
|
||||||
.innerJoin(charge.member, member)
|
.innerJoin(charge.member, member)
|
||||||
.leftJoin(charge.payment, payment)
|
.innerJoin(charge.payment, payment)
|
||||||
.where(
|
.where(
|
||||||
charge.status.eq(ChargeStatus.CHARGE),
|
charge.status.eq(ChargeStatus.CHARGE),
|
||||||
payment.status.eq(PaymentStatus.COMPLETE),
|
payment.status.eq(PaymentStatus.COMPLETE),
|
||||||
|
|
Loading…
Reference in New Issue