Merge pull request 'feat/dev_251201' (#141) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/141
This commit is contained in:
@@ -305,28 +305,17 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport
|
|||||||
.limit(pageable.getPageSize())
|
.limit(pageable.getPageSize())
|
||||||
.fetch();
|
.fetch();
|
||||||
|
|
||||||
/*
|
|
||||||
Long countQuery =
|
Long countQuery =
|
||||||
queryFactory
|
queryFactory
|
||||||
.select(labelingAssignmentEntity.workerUid.count())
|
.select(labelingAssignmentEntity.workerUid.countDistinct())
|
||||||
.from(labelingAssignmentEntity)
|
|
||||||
.where(whereBuilder)
|
|
||||||
.fetchOne();
|
|
||||||
*/
|
|
||||||
|
|
||||||
Long totalCnt =
|
|
||||||
(long)
|
|
||||||
queryFactory
|
|
||||||
.select(memberEntity.userRole, memberEntity.name, memberEntity.userId)
|
|
||||||
.from(labelingAssignmentEntity)
|
.from(labelingAssignmentEntity)
|
||||||
.innerJoin(memberEntity)
|
.innerJoin(memberEntity)
|
||||||
.on(whereSubBuilder)
|
.on(whereSubBuilder)
|
||||||
.where(whereBuilder)
|
.where(whereBuilder)
|
||||||
.groupBy(memberEntity.userRole, memberEntity.name, memberEntity.userId)
|
// .groupBy(memberEntity.userRole, memberEntity.name, memberEntity.userId)
|
||||||
.fetch()
|
.fetchOne();
|
||||||
.size();
|
|
||||||
|
|
||||||
return new PageImpl<>(foundContent, pageable, totalCnt);
|
return new PageImpl<>(foundContent, pageable, countQuery);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
Reference in New Issue
Block a user