From ed075e47bd8051b26560aa17abd72b5f2556737b Mon Sep 17 00:00:00 2001 From: Moon Date: Mon, 5 Jan 2026 15:16:09 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=9E=91=EC=97=85=ED=98=84=ED=99=A9?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../label/LabelWorkRepositoryImpl.java | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java index dbc1d4cb..39fc3860 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java @@ -305,27 +305,17 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport .limit(pageable.getPageSize()) .fetch(); - /* Long countQuery = queryFactory - .select(labelingAssignmentEntity.workerUid.count()) + .select(labelingAssignmentEntity.workerUid.countDistinct()) .from(labelingAssignmentEntity) + .innerJoin(memberEntity) + .on(whereSubBuilder) .where(whereBuilder) + //.groupBy(memberEntity.userRole, memberEntity.name, memberEntity.userId) .fetchOne(); - */ - Long total = - queryFactory - .select(mapSheetAnalInferenceEntity.uuid.countDistinct()) - .from(mapSheetAnalInferenceEntity) - .innerJoin(mapSheetAnalDataInferenceEntity) - .on(whereSubDataBuilder) - .innerJoin(mapSheetAnalDataInferenceGeomEntity) - .on(whereSubBuilder) - .where(whereBuilder) - .fetchOne(); - - return new PageImpl<>(foundContent, pageable, total); + return new PageImpl<>(foundContent, pageable, countQuery); } /** From 0129dcacc5b7bba89bfc84eb1d18286e3d41c2cf Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Mon, 5 Jan 2026 15:19:15 +0900 Subject: [PATCH 2/2] spotless --- .../label/LabelWorkRepositoryImpl.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java index 39fc3860..a7de04c2 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelWorkRepositoryImpl.java @@ -306,14 +306,14 @@ public class LabelWorkRepositoryImpl extends QuerydslRepositorySupport .fetch(); Long countQuery = - queryFactory - .select(labelingAssignmentEntity.workerUid.countDistinct()) - .from(labelingAssignmentEntity) - .innerJoin(memberEntity) - .on(whereSubBuilder) - .where(whereBuilder) - //.groupBy(memberEntity.userRole, memberEntity.name, memberEntity.userId) - .fetchOne(); + queryFactory + .select(labelingAssignmentEntity.workerUid.countDistinct()) + .from(labelingAssignmentEntity) + .innerJoin(memberEntity) + .on(whereSubBuilder) + .where(whereBuilder) + // .groupBy(memberEntity.userRole, memberEntity.name, memberEntity.userId) + .fetchOne(); return new PageImpl<>(foundContent, pageable, countQuery); }