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()