From a413de4b930c9cdb7b660ac370a051b1a32e92f9 Mon Sep 17 00:00:00 2001 From: "gayoun.park" Date: Fri, 6 Mar 2026 13:12:33 +0900 Subject: [PATCH] =?UTF-8?q?=ED=95=99=EC=8A=B5=EB=8D=B0=EC=9D=B4=ED=84=B0?= =?UTF-8?q?=20=EC=83=81=EC=84=B8=20>=20=ED=8F=B4=EB=A6=AC=EA=B3=A4=20?= =?UTF-8?q?=EC=88=98=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../label/LabelAllocateRepositoryImpl.java | 29 ++++++++++++------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java index 0bbb7962..6a38bc06 100644 --- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java +++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java @@ -6,7 +6,6 @@ import static com.kamco.cd.kamcoback.postgres.entity.QLabelingLabelerEntity.labe import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceEntity.mapSheetAnalDataInferenceEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalDataInferenceGeomEntity.mapSheetAnalDataInferenceGeomEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetAnalInferenceEntity.mapSheetAnalInferenceEntity; -import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnDataGeomEntity.mapSheetLearnDataGeomEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMapSheetLearnEntity.mapSheetLearnEntity; import static com.kamco.cd.kamcoback.postgres.entity.QMemberEntity.memberEntity; @@ -490,17 +489,21 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto inspectionStatus = inspectionRemaining > 0 ? "진행중" : "완료"; } + ZoneId zoneId = ZoneId.of("Asia/Seoul"); + LocalDate targetDate = LocalDate.now(zoneId); + + ZonedDateTime end = targetDate.plusDays(1).atStartOfDay(zoneId); Long downloadPolygonCnt = queryFactory - .select(mapSheetLearnDataGeomEntity.geoUid.count()) - .from(mapSheetLearnDataGeomEntity) - .innerJoin(labelingAssignmentEntity) - .on(labelingAssignmentEntity.inferenceGeomUid.eq(mapSheetLearnDataGeomEntity.geoUid)) + .select(labelingAssignmentEntity.inferenceGeomUid.count()) + .from(labelingAssignmentEntity) .innerJoin(mapSheetAnalInferenceEntity) .on( labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id), mapSheetAnalInferenceEntity.id.eq(analUid)) - .where(mapSheetLearnDataGeomEntity.fileCreateYn.isTrue()) + .where( + labelingAssignmentEntity.inspectState.eq(InspectState.COMPLETE.getId()), + labelingAssignmentEntity.inspectStatDttm.lt(end)) .fetchOne(); return WorkProgressInfo.builder() @@ -670,17 +673,21 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto inspectionStatus = inspectionRemaining > 0 ? "진행중" : "완료"; } + ZoneId zoneId = ZoneId.of("Asia/Seoul"); + LocalDate targetDate = LocalDate.now(zoneId); + + ZonedDateTime end = targetDate.plusDays(1).atStartOfDay(zoneId); Long downloadPolygonCnt = queryFactory - .select(mapSheetLearnDataGeomEntity.geoUid.count()) - .from(mapSheetLearnDataGeomEntity) - .innerJoin(labelingAssignmentEntity) - .on(labelingAssignmentEntity.inferenceGeomUid.eq(mapSheetLearnDataGeomEntity.geoUid)) + .select(labelingAssignmentEntity.inferenceGeomUid.count()) + .from(labelingAssignmentEntity) .innerJoin(mapSheetAnalInferenceEntity) .on( labelingAssignmentEntity.analUid.eq(mapSheetAnalInferenceEntity.id), mapSheetAnalInferenceEntity.uuid.eq(targetUuid)) - .where(mapSheetLearnDataGeomEntity.fileCreateYn.isTrue()) + .where( + labelingAssignmentEntity.inspectState.eq(InspectState.COMPLETE.getId()), + labelingAssignmentEntity.inspectStatDttm.lt(end)) .fetchOne(); return WorkProgressInfo.builder()