Merge branch 'feat/dev_251201' of https://10.100.0.10:3210/dabeeo/kamco-dabeeo-backoffice into feat/dev_251201

# Conflicts: # src/main/java/com/kamco/cd/kamcoback/label/LabelAllocateApiController.java # src/main/java/com/kamco/cd/kamcoback/label/service/LabelAllocateService.java # src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelAllocateCoreService.java # src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java
2026-01-05 13:34:21 +09:00
parent f5fcc2a9e3 877de7f17e
commit d86e70e27e
6 changed files with 688 additions and 487 deletions
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelAllocateCoreService.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/core/LabelAllocateCoreService.java
@@ -7,6 +7,7 @@ import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelerDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelingStatDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.searchReq;
+import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.ProjectInfo;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkProgressInfo;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
 import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity;
@@ -25,7 +26,7 @@ public class LabelAllocateCoreService {
  private final LabelAllocateRepository labelAllocateRepository;

  public List<AllocateInfoDto> fetchNextIds(
-    Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage) {
+      Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage) {
    return labelAllocateRepository.fetchNextIds(lastId, batchSize, compareYyyy, targetYyyy, stage);
  }

@@ -35,8 +36,8 @@ public class LabelAllocateCoreService {

  public List<LabelAllocateDto.Basic> findAssignedLabelerList(Long analUid) {
    return labelAllocateRepository.findAssignedLabelerList(analUid).stream()
-      .map(LabelingAssignmentEntity::toDto)
-      .toList();
+        .map(LabelingAssignmentEntity::toDto)
+        .toList();
  }

  public Long findLabelUnAssignedCnt(Integer stage, Integer compareYyyy, Integer targetYyyy) {
@@ -51,13 +52,17 @@ public class LabelAllocateCoreService {
    return labelAllocateRepository.availUserList(role);
  }

+  public ProjectInfo findProjectInfo(Long analUid) {
+    return labelAllocateRepository.findProjectInfo(analUid);
+  }
+
  public List<WorkerStatistics> findWorkerStatistics(
-    Long analUid,
-    String workerType,
-    String search,
-    String sortType) {
+      Long analUid,
+      String workerType,
+      String search,
+      String sortType) {
    return labelAllocateRepository.findWorkerStatistics(
-      analUid, workerType, search, sortType);
+        analUid, workerType, search, sortType);
  }

  public WorkProgressInfo findWorkProgressInfo(Long analUid) {
@@ -65,7 +70,7 @@ public class LabelAllocateCoreService {
  }

  public Long findDailyProcessedCount(
-    String workerId, String workerType, LocalDate date, Long analUid) {
+      String workerId, String workerType, LocalDate date, Long analUid) {
    return labelAllocateRepository.findDailyProcessedCount(workerId, workerType, date, analUid);
  }

@@ -78,9 +83,9 @@ public class LabelAllocateCoreService {
  }

  public List<Long> fetchNextMoveIds(
-    Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage) {
+      Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage) {
    return labelAllocateRepository.fetchNextMoveIds(
-      lastId, batchSize, compareYyyy, targetYyyy, stage);
+        lastId, batchSize, compareYyyy, targetYyyy, stage);
  }

  public void assignOwnerMove(List<Long> sub, String userId) {
--- a/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryCustom.java
+++ b/src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryCustom.java
@@ -6,6 +6,7 @@ import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.InferenceDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelerDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelingStatDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList;
+import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.ProjectInfo;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkProgressInfo;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
 import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity;
@@ -29,6 +30,9 @@ public interface LabelAllocateRepositoryCustom {

  List<UserList> availUserList(String role);

+  // 프로젝트 정보 조회
+  ProjectInfo findProjectInfo(Long analUid);
+
  // 작업자 통계 조회
  List<WorkerStatistics> findWorkerStatistics(
    Long analUid, String workerType, String search, String sortType);
--- 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
@@ -15,7 +15,7 @@ import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelState;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelerDetail;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelingStatDto;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.UserList;
-import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.searchReq;
+import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.ProjectInfo;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkProgressInfo;
 import com.kamco.cd.kamcoback.label.dto.WorkerStatsDto.WorkerStatistics;
 import com.kamco.cd.kamcoback.postgres.entity.LabelingAssignmentEntity;
@@ -37,9 +37,12 @@ import java.time.LocalDate;
 import java.time.LocalTime;
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.List;
 import java.util.Objects;
 import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.data.domain.Page;
@@ -54,29 +57,28 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto

  private final JPAQueryFactory queryFactory;

-  @PersistenceContext
-  private EntityManager em;
+  @PersistenceContext private EntityManager em;

  @Override
  public List<AllocateInfoDto> fetchNextIds(
-    Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage) {
+      Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage) {

    return queryFactory
-      .select(
-        Projections.constructor(
-          AllocateInfoDto.class,
-          mapSheetAnalDataInferenceGeomEntity.geoUid,
-          mapSheetAnalDataInferenceGeomEntity.mapSheetNum))
-      .from(mapSheetAnalDataInferenceGeomEntity)
-      .where(
-        lastId == null ? null : mapSheetAnalDataInferenceGeomEntity.geoUid.gt(lastId),
-        mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(compareYyyy),
-        mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(targetYyyy),
-        mapSheetAnalDataInferenceGeomEntity.stage.eq(stage),
-        mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
-      .orderBy(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.asc())
-      .limit(batchSize)
-      .fetch();
+        .select(
+            Projections.constructor(
+                AllocateInfoDto.class,
+                mapSheetAnalDataInferenceGeomEntity.geoUid,
+                mapSheetAnalDataInferenceGeomEntity.mapSheetNum))
+        .from(mapSheetAnalDataInferenceGeomEntity)
+        .where(
+            lastId == null ? null : mapSheetAnalDataInferenceGeomEntity.geoUid.gt(lastId),
+            mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(compareYyyy),
+            mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(targetYyyy),
+            mapSheetAnalDataInferenceGeomEntity.stage.eq(stage),
+            mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
+        .orderBy(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.asc())
+        .limit(batchSize)
+        .fetch();
  }

  @Override
@@ -84,10 +86,10 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto

    // analUid로 분석 정보 조회
    MapSheetAnalInferenceEntity analEntity =
-      queryFactory
-        .selectFrom(mapSheetAnalInferenceEntity)
-        .where(mapSheetAnalInferenceEntity.id.eq(analUid))
-        .fetchOne();
+        queryFactory
+            .selectFrom(mapSheetAnalInferenceEntity)
+            .where(mapSheetAnalInferenceEntity.id.eq(analUid))
+            .fetchOne();

    if (Objects.isNull(analEntity)) {
      throw new EntityNotFoundException("MapSheetAnalInferenceEntity not found for analUid: ");
@@ -95,20 +97,20 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto

    // data_geom 테이블에 label state 를 ASSIGNED 로 update
    List<Long> geoUidList =
-      ids.stream().map(AllocateInfoDto::getGeoUid).filter(Objects::nonNull).toList();
+        ids.stream().map(AllocateInfoDto::getGeoUid).filter(Objects::nonNull).toList();

    queryFactory
-      .update(mapSheetAnalDataInferenceGeomEntity)
-      .set(mapSheetAnalDataInferenceGeomEntity.labelState, LabelState.ASSIGNED.getId())
-      .set(mapSheetAnalDataInferenceGeomEntity.labelStateDttm, ZonedDateTime.now())
-      .set(mapSheetAnalDataInferenceGeomEntity.testState, InspectState.UNCONFIRM.getId())
-      .set(mapSheetAnalDataInferenceGeomEntity.testStateDttm, ZonedDateTime.now())
-      .where(mapSheetAnalDataInferenceGeomEntity.geoUid.in(geoUidList))
-      .execute();
+        .update(mapSheetAnalDataInferenceGeomEntity)
+        .set(mapSheetAnalDataInferenceGeomEntity.labelState, LabelState.ASSIGNED.getId())
+        .set(mapSheetAnalDataInferenceGeomEntity.labelStateDttm, ZonedDateTime.now())
+        .set(mapSheetAnalDataInferenceGeomEntity.testState, InspectState.UNCONFIRM.getId())
+        .set(mapSheetAnalDataInferenceGeomEntity.testStateDttm, ZonedDateTime.now())
+        .where(mapSheetAnalDataInferenceGeomEntity.geoUid.in(geoUidList))
+        .execute();

    // 라벨러 할당 테이블에 insert
    String sql =
-      """
+        """
        insert into tb_labeling_assignment
        (assignment_uid, inference_geom_uid, worker_uid,
         work_state, assign_group_id, anal_uid)
@@ -117,13 +119,13 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto

    for (AllocateInfoDto info : ids) {
      em.createNativeQuery(sql)
-        .setParameter(1, UUID.randomUUID())
-        .setParameter(2, info.getGeoUid())
-        .setParameter(3, userId)
-        .setParameter(4, LabelState.ASSIGNED.getId())
-        .setParameter(5, info.getMapSheetNum())
-        .setParameter(6, analEntity.getId())
-        .executeUpdate();
+          .setParameter(1, UUID.randomUUID())
+          .setParameter(2, info.getGeoUid())
+          .setParameter(3, userId)
+          .setParameter(4, LabelState.ASSIGNED.getId())
+          .setParameter(5, info.getMapSheetNum())
+          .setParameter(6, analEntity.getId())
+          .executeUpdate();
    }

    em.flush();
@@ -134,137 +136,137 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
  public List<LabelingAssignmentEntity> findAssignedLabelerList(Long analUid) {
    // analUid로 분석 정보 조회
    MapSheetAnalInferenceEntity analEntity =
-      queryFactory
-        .selectFrom(mapSheetAnalInferenceEntity)
-        .where(mapSheetAnalInferenceEntity.id.eq(analUid))
-        .fetchOne();
+        queryFactory
+            .selectFrom(mapSheetAnalInferenceEntity)
+            .where(mapSheetAnalInferenceEntity.id.eq(analUid))
+            .fetchOne();

    if (Objects.isNull(analEntity)) {
      throw new EntityNotFoundException("mapSheetAnalInferenceEntity not found for analUid: ");
    }

    return queryFactory
-      .selectFrom(labelingAssignmentEntity)
-      .where(
-        labelingAssignmentEntity.analUid.eq(analEntity.getId()),
-        labelingAssignmentEntity.workState.eq(LabelState.ASSIGNED.getId()),
-        labelingAssignmentEntity.inspectorUid.isNull())
-      .orderBy(labelingAssignmentEntity.workerUid.asc())
-      .fetch();
+        .selectFrom(labelingAssignmentEntity)
+        .where(
+            labelingAssignmentEntity.analUid.eq(analEntity.getId()),
+            labelingAssignmentEntity.workState.eq(LabelState.ASSIGNED.getId()),
+            labelingAssignmentEntity.inspectorUid.isNull())
+        .orderBy(labelingAssignmentEntity.workerUid.asc())
+        .fetch();
  }

  @Override
  public Long findLabelUnAssignedCnt(Integer stage, Integer compareYyyy, Integer targetYyyy) {

    return queryFactory
-      .select(mapSheetAnalDataInferenceGeomEntity.geoUid.count())
-      .from(mapSheetAnalDataInferenceGeomEntity)
-      .where(
-        mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(compareYyyy),
-        mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(targetYyyy),
-        mapSheetAnalDataInferenceGeomEntity.stage.eq(stage),
-        mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
-      .fetchOne();
+        .select(mapSheetAnalDataInferenceGeomEntity.geoUid.count())
+        .from(mapSheetAnalDataInferenceGeomEntity)
+        .where(
+            mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(compareYyyy),
+            mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(targetYyyy),
+            mapSheetAnalDataInferenceGeomEntity.stage.eq(stage),
+            mapSheetAnalDataInferenceGeomEntity.labelState.isNull())
+        .fetchOne();
  }

  @Override
  public void assignInspector(UUID assignmentUid, String inspectorUid) {
    queryFactory
-      .update(labelingAssignmentEntity)
-      .set(labelingAssignmentEntity.inspectorUid, inspectorUid)
-      .where(labelingAssignmentEntity.assignmentUid.eq(assignmentUid))
-      .execute();
+        .update(labelingAssignmentEntity)
+        .set(labelingAssignmentEntity.inspectorUid, inspectorUid)
+        .where(labelingAssignmentEntity.assignmentUid.eq(assignmentUid))
+        .execute();
  }

  @Override
  public List<UserList> availUserList(String role) {
    return queryFactory
-      .select(
-        Projections.constructor(
-          LabelAllocateDto.UserList.class,
-          memberEntity.userRole,
-          memberEntity.employeeNo,
-          memberEntity.name))
-      .from(memberEntity)
-      .where(
-        memberEntity.userRole.eq(role),
-        memberEntity.status.eq(com.kamco.cd.kamcoback.common.enums.StatusType.ACTIVE.getId()))
-      .orderBy(memberEntity.name.asc())
-      .fetch();
+        .select(
+            Projections.constructor(
+                LabelAllocateDto.UserList.class,
+                memberEntity.userRole,
+                memberEntity.employeeNo,
+                memberEntity.name))
+        .from(memberEntity)
+        .where(
+            memberEntity.userRole.eq(role),
+            memberEntity.status.eq(com.kamco.cd.kamcoback.common.enums.StatusType.ACTIVE.getId()))
+        .orderBy(memberEntity.name.asc())
+        .fetch();
  }

  @Override
  public List<WorkerStatistics> findWorkerStatistics(
-    Long analUid,
-    String workerType,
-    String search,
-    String sortType) {
+      Long analUid,
+      String workerType,
+      String search,
+      String sortType) {

    // 작업자 유형에 따른 필드 선택
    StringExpression workerIdField =
-      "REVIEWER".equals(workerType)
-        ? labelingAssignmentEntity.inspectorUid
-        : labelingAssignmentEntity.workerUid;
+        "REVIEWER".equals(workerType)
+            ? labelingAssignmentEntity.inspectorUid
+            : labelingAssignmentEntity.workerUid;

    BooleanExpression workerCondition =
-      "REVIEWER".equals(workerType)
-        ? labelingAssignmentEntity.inspectorUid.isNotNull()
-        : labelingAssignmentEntity.workerUid.isNotNull();
+        "REVIEWER".equals(workerType)
+            ? labelingAssignmentEntity.inspectorUid.isNotNull()
+            : labelingAssignmentEntity.workerUid.isNotNull();

    // 검색 조건 (이름 또는 사번으로 검색)
    BooleanExpression searchCondition = null;
    if (search != null && !search.isEmpty()) {
      searchCondition = memberEntity.name.contains(search)
-        .or(memberEntity.employeeNo.contains(search));
+          .or(memberEntity.employeeNo.contains(search));
    }

    // 완료, 스킵, 남은 작업 계산
    NumberExpression<Long> completedSum =
-      new CaseBuilder()
-        .when(labelingAssignmentEntity.workState.eq("DONE"))
-        .then(1L)
-        .otherwise(0L)
-        .sum();
+        new CaseBuilder()
+            .when(labelingAssignmentEntity.workState.eq("DONE"))
+            .then(1L)
+            .otherwise(0L)
+            .sum();

    NumberExpression<Long> skippedSum =
-      new CaseBuilder()
-        .when(labelingAssignmentEntity.workState.eq("SKIP"))
-        .then(1L)
-        .otherwise(0L)
-        .sum();
+        new CaseBuilder()
+            .when(labelingAssignmentEntity.workState.eq("SKIP"))
+            .then(1L)
+            .otherwise(0L)
+            .sum();

    NumberExpression<Long> remainingSum =
-      new CaseBuilder()
-        .when(
-          labelingAssignmentEntity
-            .workState
-            .notIn("DONE", "SKIP")
-            .and(labelingAssignmentEntity.workState.isNotNull()))
-        .then(1L)
-        .otherwise(0L)
-        .sum();
+        new CaseBuilder()
+            .when(
+                labelingAssignmentEntity
+                    .workState
+                    .notIn("DONE", "SKIP")
+                    .and(labelingAssignmentEntity.workState.isNotNull()))
+            .then(1L)
+            .otherwise(0L)
+            .sum();

    // 기본 통계 조회 쿼리
    BooleanExpression analUidCondition = analUid != null ? labelingAssignmentEntity.analUid.eq(analUid) : null;

    var baseQuery =
-      queryFactory
-        .select(
-          workerIdField,
-          memberEntity.name,
-          workerIdField.count(),
-          completedSum,
-          skippedSum,
-          remainingSum,
-          labelingAssignmentEntity.stagnationYn.max())
-        .from(labelingAssignmentEntity)
-        .leftJoin(memberEntity)
-        .on(
-          "REVIEWER".equals(workerType)
-            ? memberEntity.employeeNo.eq(labelingAssignmentEntity.inspectorUid)
-            : memberEntity.employeeNo.eq(labelingAssignmentEntity.workerUid))
-        .where(analUidCondition, workerCondition, searchCondition)
-        .groupBy(workerIdField, memberEntity.name);
+        queryFactory
+            .select(
+                workerIdField,
+                memberEntity.name,
+                workerIdField.count(),
+                completedSum,
+                skippedSum,
+                remainingSum,
+                labelingAssignmentEntity.stagnationYn.max())
+            .from(labelingAssignmentEntity)
+            .leftJoin(memberEntity)
+            .on(
+                "REVIEWER".equals(workerType)
+                    ? memberEntity.employeeNo.eq(labelingAssignmentEntity.inspectorUid)
+                    : memberEntity.employeeNo.eq(labelingAssignmentEntity.workerUid))
+            .where(analUidCondition, workerCondition, searchCondition)
+            .groupBy(workerIdField, memberEntity.name);

    // 정렬 조건 적용
    if (sortType != null) {
@@ -275,6 +277,12 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
        case "REMAINING_ASC":
          baseQuery.orderBy(remainingSum.asc());
          break;
+        case "COMPLETED_DESC":
+          baseQuery.orderBy(completedSum.desc());
+          break;
+        case "COMPLETED_ASC":
+          baseQuery.orderBy(completedSum.asc());
+          break;
        case "NAME_ASC":
          baseQuery.orderBy(memberEntity.name.asc());
          break;
@@ -290,22 +298,22 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto

    // 결과를 DTO로 변환
    return baseQuery.fetch().stream()
-      .map(
-        tuple -> {
-          Character maxStagnationYn = tuple.get(labelingAssignmentEntity.stagnationYn.max());
-          return WorkerStatistics.builder()
-            .workerId(tuple.get(workerIdField))
-            .workerName(tuple.get(memberEntity.name))
-            .workerType(workerType)
-            .totalAssigned(tuple.get(workerIdField.count()))
-            .completed(tuple.get(completedSum))
-            .skipped(tuple.get(skippedSum))
-            .remaining(tuple.get(remainingSum))
-            .history(null) // 3일 이력은 Service에서 채움
-            .isStagnated(maxStagnationYn != null && maxStagnationYn == 'Y')
-            .build();
-        })
-      .toList();
+        .map(
+            tuple -> {
+              Character maxStagnationYn = tuple.get(labelingAssignmentEntity.stagnationYn.max());
+              return WorkerStatistics.builder()
+                  .workerId(tuple.get(workerIdField))
+                  .workerName(tuple.get(memberEntity.name))
+                  .workerType(workerType)
+                  .totalAssigned(tuple.get(workerIdField.count()))
+                  .completed(tuple.get(completedSum))
+                  .skipped(tuple.get(skippedSum))
+                  .remaining(tuple.get(remainingSum))
+                  .history(null) // 3일 이력은 Service에서 채움
+                  .isStagnated(maxStagnationYn != null && maxStagnationYn == 'Y')
+                  .build();
+            })
+        .toList();
  }

  @Override
@@ -314,112 +322,134 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto

    // 전체 배정 건수
    Long totalAssigned =
-      queryFactory
-        .select(labelingAssignmentEntity.count())
-        .from(labelingAssignmentEntity)
-        .where(analUidCondition)
-        .fetchOne();
+        queryFactory
+            .select(labelingAssignmentEntity.count())
+            .from(labelingAssignmentEntity)
+            .where(analUidCondition)
+            .fetchOne();

-    // 완료 + 스킵 건수
-    Long completedCount =
-      queryFactory
-        .select(labelingAssignmentEntity.count())
-        .from(labelingAssignmentEntity)
-        .where(
-          analUidCondition,
-          labelingAssignmentEntity.workState.in("DONE", "SKIP"))
-        .fetchOne();
+    // === 라벨링 통계 ===
+    // 라벨링 완료: LABEL_FIN, TEST_ING, DONE (검수 포함)
+    Long labelingCompleted =
+        queryFactory
+            .select(labelingAssignmentEntity.count())
+            .from(labelingAssignmentEntity)
+            .where(
+                analUidCondition,
+                labelingAssignmentEntity.workState.in("LABEL_FIN", "TEST_ING", "DONE"))
+            .fetchOne();

-    // 투입된 라벨러 수 (고유한 worker_uid 수)
+    // 스킵 건수
+    Long skipCount =
+        queryFactory
+            .select(labelingAssignmentEntity.count())
+            .from(labelingAssignmentEntity)
+            .where(
+                analUidCondition,
+                labelingAssignmentEntity.workState.eq("SKIP"))
+            .fetchOne();
+
+    // 투입된 라벨러 수
    Long labelerCount =
-      queryFactory
-        .select(labelingAssignmentEntity.workerUid.countDistinct())
-        .from(labelingAssignmentEntity)
-        .where(
-          analUidCondition,
-          labelingAssignmentEntity.workerUid.isNotNull())
-        .fetchOne();
+        queryFactory
+            .select(labelingAssignmentEntity.workerUid.countDistinct())
+            .from(labelingAssignmentEntity)
+            .where(
+                analUidCondition,
+                labelingAssignmentEntity.workerUid.isNotNull())
+            .fetchOne();

-    // 남은 라벨링 작업 데이터 수
-    Long remainingLabelCount =
-      queryFactory
-        .select(labelingAssignmentEntity.count())
-        .from(labelingAssignmentEntity)
-        .where(
-          analUidCondition,
-          labelingAssignmentEntity.workerUid.isNotNull(),
-          labelingAssignmentEntity.workState.notIn("DONE", "SKIP"))
-        .fetchOne();
+    // === 검수 통계 ===
+    // 검수 완료: DONE만
+    Long inspectionCompleted =
+        queryFactory
+            .select(labelingAssignmentEntity.count())
+            .from(labelingAssignmentEntity)
+            .where(
+                analUidCondition,
+                labelingAssignmentEntity.workState.eq("DONE"))
+            .fetchOne();

-    // 투입된 검수자 수 (고유한 inspector_uid 수)
+    // 투입된 검수자 수
    Long inspectorCount =
-      queryFactory
-        .select(labelingAssignmentEntity.inspectorUid.countDistinct())
-        .from(labelingAssignmentEntity)
-        .where(
-          analUidCondition,
-          labelingAssignmentEntity.inspectorUid.isNotNull())
-        .fetchOne();
+        queryFactory
+            .select(labelingAssignmentEntity.inspectorUid.countDistinct())
+            .from(labelingAssignmentEntity)
+            .where(
+                analUidCondition,
+                labelingAssignmentEntity.inspectorUid.isNotNull())
+            .fetchOne();

-    // 남은 검수 작업 데이터 수
-    Long remainingInspectCount =
-      queryFactory
-        .select(labelingAssignmentEntity.count())
-        .from(labelingAssignmentEntity)
-        .where(
-          analUidCondition,
-          labelingAssignmentEntity.inspectorUid.isNotNull(),
-          labelingAssignmentEntity.workState.notIn("DONE"))
-        .fetchOne();
+    // 남은 작업 건수 계산
+    long total = totalAssigned != null ? totalAssigned : 0L;
+    long labelCompleted = labelingCompleted != null ? labelingCompleted : 0L;
+    long inspectCompleted = inspectionCompleted != null ? inspectionCompleted : 0L;
+    long skipped = skipCount != null ? skipCount : 0L;
+
+    long labelingRemaining = total - labelCompleted - skipped;
+    long inspectionRemaining = total - inspectCompleted - skipped;

    // 진행률 계산
-    double progressRate = 0.0;
-    if (totalAssigned != null && totalAssigned > 0) {
-      progressRate =
-        (completedCount != null ? completedCount.doubleValue() : 0.0) / totalAssigned * 100;
-    }
+    double labelingRate = total > 0 ? (double) labelCompleted / total * 100 : 0.0;
+    double inspectionRate = total > 0 ? (double) inspectCompleted / total * 100 : 0.0;

-    // 작업 상태 판단 (간단하게 진행률 100%면 종료, 아니면 진행중)
-    String workStatus = (progressRate >= 100.0) ? "종료" : "진행중";
+    // 상태 판단
+    String labelingStatus = labelingRemaining > 0 ? "진행중" : "완료";
+    String inspectionStatus = inspectionRemaining > 0 ? "진행중" : "완료";

    return WorkProgressInfo.builder()
-      .labelingProgressRate(progressRate)
-      .workStatus(workStatus)
-      .completedCount(completedCount != null ? completedCount : 0L)
-      .totalAssignedCount(totalAssigned != null ? totalAssigned : 0L)
-      .labelerCount(labelerCount != null ? labelerCount : 0L)
-      .remainingLabelCount(remainingLabelCount != null ? remainingLabelCount : 0L)
-      .inspectorCount(inspectorCount != null ? inspectorCount : 0L)
-      .remainingInspectCount(remainingInspectCount != null ? remainingInspectCount : 0L)
-      .build();
+        // 라벨링
+        .labelingProgressRate(labelingRate)
+        .labelingStatus(labelingStatus)
+        .labelingTotalCount(total)
+        .labelingCompletedCount(labelCompleted)
+        .labelingSkipCount(skipped)
+        .labelingRemainingCount(labelingRemaining)
+        .labelerCount(labelerCount != null ? labelerCount : 0L)
+        // 검수
+        .inspectionProgressRate(inspectionRate)
+        .inspectionStatus(inspectionStatus)
+        .inspectionTotalCount(total)
+        .inspectionCompletedCount(inspectCompleted)
+        .inspectionSkipCount(skipped)
+        .inspectionRemainingCount(inspectionRemaining)
+        .inspectorCount(inspectorCount != null ? inspectorCount : 0L)
+        // 레거시 호환 필드 (Deprecated)
+        .progressRate(labelingRate)
+        .totalAssignedCount(total)
+        .completedCount(labelCompleted)
+        .remainingLabelCount(labelingRemaining)
+        .remainingInspectCount(inspectionRemaining)
+        .workStatus(labelingStatus)
+        .build();
  }

  @Override
  public Long findDailyProcessedCount(
-    String workerId, String workerType, LocalDate date, Long analUid) {
+      String workerId, String workerType, LocalDate date, Long analUid) {

    // 해당 날짜의 시작과 끝 시간
    ZonedDateTime startOfDay = date.atStartOfDay(ZoneId.systemDefault());
    ZonedDateTime endOfDay = date.atTime(LocalTime.MAX).atZone(ZoneId.systemDefault());

    BooleanExpression workerCondition =
-      "REVIEWER".equals(workerType)
-        ? labelingAssignmentEntity.inspectorUid.eq(workerId)
-        : labelingAssignmentEntity.workerUid.eq(workerId);
+        "REVIEWER".equals(workerType)
+            ? labelingAssignmentEntity.inspectorUid.eq(workerId)
+            : labelingAssignmentEntity.workerUid.eq(workerId);

    BooleanExpression analUidCondition = analUid != null ? labelingAssignmentEntity.analUid.eq(analUid) : null;

    Long count =
-      queryFactory
-        .select(labelingAssignmentEntity.count())
-        .from(labelingAssignmentEntity)
-        .where(
-          analUidCondition,
-          workerCondition,
-          labelingAssignmentEntity.workState.in(
-            LabelState.DONE.getId(), LabelState.SKIP.getId()),
-          labelingAssignmentEntity.modifiedDate.between(startOfDay, endOfDay))
-        .fetchOne();
+        queryFactory
+            .select(labelingAssignmentEntity.count())
+            .from(labelingAssignmentEntity)
+            .where(
+                analUidCondition,
+                workerCondition,
+                labelingAssignmentEntity.workState.in(
+                    LabelState.DONE.getId(), LabelState.SKIP.getId()),
+                labelingAssignmentEntity.modifiedDate.between(startOfDay, endOfDay))
+            .fetchOne();

    return count != null ? count : 0L;
  }
@@ -427,10 +457,10 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
  @Override
  public void assignInspectorBulk(List<UUID> assignmentUids, String inspectorUid) {
    queryFactory
-      .update(labelingAssignmentEntity)
-      .set(labelingAssignmentEntity.inspectorUid, inspectorUid)
-      .where(labelingAssignmentEntity.assignmentUid.in(assignmentUids))
-      .execute();
+        .update(labelingAssignmentEntity)
+        .set(labelingAssignmentEntity.inspectorUid, inspectorUid)
+        .where(labelingAssignmentEntity.assignmentUid.in(assignmentUids))
+        .execute();

    em.clear();
  }
@@ -439,64 +469,64 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
  public InferenceDetail findInferenceDetail(String uuid) {
    // analUid로 분석 정보 조회
    MapSheetAnalInferenceEntity analEntity =
-      queryFactory
-        .selectFrom(mapSheetAnalInferenceEntity)
-        .where(mapSheetAnalInferenceEntity.uuid.eq(UUID.fromString(uuid)))
-        .fetchOne();
+        queryFactory
+            .selectFrom(mapSheetAnalInferenceEntity)
+            .where(mapSheetAnalInferenceEntity.uuid.eq(UUID.fromString(uuid)))
+            .fetchOne();

    if (Objects.isNull(analEntity)) {
      throw new EntityNotFoundException("MapSheetAnalInferenceEntity not found for analUid: ");
    }

    return queryFactory
-      .select(
-        Projections.constructor(
-          InferenceDetail.class,
-          mapSheetAnalEntity.analTitle,
-          Expressions.numberTemplate(Integer.class, "{0}", 4),
-          mapSheetAnalEntity.gukyuinApplyDttm,
-          mapSheetAnalEntity.detectingCnt,
-          labelingAssignmentEntity.workerUid.countDistinct(),
-          labelingAssignmentEntity.inspectorUid.countDistinct()))
-      .from(mapSheetAnalEntity)
-      .innerJoin(labelingAssignmentEntity)
-      .on(mapSheetAnalEntity.id.eq(labelingAssignmentEntity.analUid))
-      .where(mapSheetAnalEntity.id.eq(analEntity.getId()))
-      .groupBy(
-        mapSheetAnalEntity.analTitle,
-        mapSheetAnalEntity.gukyuinApplyDttm,
-        mapSheetAnalEntity.detectingCnt)
-      .fetchOne();
+        .select(
+            Projections.constructor(
+                InferenceDetail.class,
+                mapSheetAnalEntity.analTitle,
+                Expressions.numberTemplate(Integer.class, "{0}", 4),
+                mapSheetAnalEntity.gukyuinApplyDttm,
+                mapSheetAnalEntity.detectingCnt,
+                labelingAssignmentEntity.workerUid.countDistinct(),
+                labelingAssignmentEntity.inspectorUid.countDistinct()))
+        .from(mapSheetAnalEntity)
+        .innerJoin(labelingAssignmentEntity)
+        .on(mapSheetAnalEntity.id.eq(labelingAssignmentEntity.analUid))
+        .where(mapSheetAnalEntity.id.eq(analEntity.getId()))
+        .groupBy(
+            mapSheetAnalEntity.analTitle,
+            mapSheetAnalEntity.gukyuinApplyDttm,
+            mapSheetAnalEntity.detectingCnt)
+        .fetchOne();
  }

  @Override
  public List<Long> fetchNextMoveIds(
-    Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage) {
+      Long lastId, Long batchSize, Integer compareYyyy, Integer targetYyyy, Integer stage) {

    return queryFactory
-      .select(mapSheetAnalDataInferenceGeomEntity.geoUid)
-      .from(mapSheetAnalDataInferenceGeomEntity)
-      .where(
-        //        mapSheetAnalDataGeomEntity.pnu.isNotNull(),   //TODO: Mockup 진행 이후 확인하기
-        lastId == null ? null : mapSheetAnalDataInferenceGeomEntity.geoUid.gt(lastId),
-        mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(compareYyyy),
-        mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(targetYyyy),
-        mapSheetAnalDataInferenceGeomEntity.stage.eq(stage),
-        mapSheetAnalDataInferenceGeomEntity.labelState.in(
-          LabelState.ASSIGNED.getId(), LabelState.SKIP.getId()))
-      .orderBy(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.asc())
-      .limit(batchSize)
-      .fetch();
+        .select(mapSheetAnalDataInferenceGeomEntity.geoUid)
+        .from(mapSheetAnalDataInferenceGeomEntity)
+        .where(
+            //        mapSheetAnalDataGeomEntity.pnu.isNotNull(),   //TODO: Mockup 진행 이후 확인하기
+            lastId == null ? null : mapSheetAnalDataInferenceGeomEntity.geoUid.gt(lastId),
+            mapSheetAnalDataInferenceGeomEntity.compareYyyy.eq(compareYyyy),
+            mapSheetAnalDataInferenceGeomEntity.targetYyyy.eq(targetYyyy),
+            mapSheetAnalDataInferenceGeomEntity.stage.eq(stage),
+            mapSheetAnalDataInferenceGeomEntity.labelState.in(
+                LabelState.ASSIGNED.getId(), LabelState.SKIP.getId()))
+        .orderBy(mapSheetAnalDataInferenceGeomEntity.mapSheetNum.asc())
+        .limit(batchSize)
+        .fetch();
  }

  @Transactional
  @Override
  public void assignOwnerMove(List<Long> sub, String userId) {
    queryFactory
-      .update(labelingAssignmentEntity)
-      .set(labelingAssignmentEntity.workerUid, userId)
-      .where(labelingAssignmentEntity.inferenceGeomUid.in(sub))
-      .execute();
+        .update(labelingAssignmentEntity)
+        .set(labelingAssignmentEntity.workerUid, userId)
+        .where(labelingAssignmentEntity.inferenceGeomUid.in(sub))
+        .execute();

    em.clear();
  }
@@ -504,43 +534,43 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
  @Override
  public LabelerDetail findLabelerDetail(String userId, String uuid) {
    NumberExpression<Long> assignedCnt =
-      new CaseBuilder()
-        .when(labelingAssignmentEntity.workState.eq(LabelState.ASSIGNED.getId()))
-        .then(1L)
-        .otherwise((Long) null)
-        .count();
+        new CaseBuilder()
+            .when(labelingAssignmentEntity.workState.eq(LabelState.ASSIGNED.getId()))
+            .then(1L)
+            .otherwise((Long) null)
+            .count();

    NumberExpression<Long> skipCnt =
-      new CaseBuilder()
-        .when(labelingAssignmentEntity.workState.eq(LabelState.SKIP.getId()))
-        .then(1L)
-        .otherwise((Long) null)
-        .count();
+        new CaseBuilder()
+            .when(labelingAssignmentEntity.workState.eq(LabelState.SKIP.getId()))
+            .then(1L)
+            .otherwise((Long) null)
+            .count();

    NumberExpression<Long> completeCnt =
-      new CaseBuilder()
-        .when(labelingAssignmentEntity.workState.eq(LabelState.COMPLETE.getId()))
-        .then(1L)
-        .otherwise((Long) null)
-        .count();
+        new CaseBuilder()
+            .when(labelingAssignmentEntity.workState.eq(LabelState.COMPLETE.getId()))
+            .then(1L)
+            .otherwise((Long) null)
+            .count();

    NumberExpression<Double> percent =
-      new CaseBuilder()
-        .when(completeCnt.eq(0L))
-        .then(0.0)
-        .otherwise(
-          Expressions.numberTemplate(
-            Double.class,
-            "round({0} / {1}, 2)",
-            labelingAssignmentEntity.count(),
-            completeCnt));
+        new CaseBuilder()
+            .when(completeCnt.eq(0L))
+            .then(0.0)
+            .otherwise(
+                Expressions.numberTemplate(
+                    Double.class,
+                    "round({0} / {1}, 2)",
+                    labelingAssignmentEntity.count(),
+                    completeCnt));

    // analUid로 분석 정보 조회
    MapSheetAnalInferenceEntity analEntity =
-      queryFactory
-        .selectFrom(mapSheetAnalInferenceEntity)
-        .where(mapSheetAnalInferenceEntity.uuid.eq(UUID.fromString(uuid)))
-        .fetchOne();
+        queryFactory
+            .selectFrom(mapSheetAnalInferenceEntity)
+            .where(mapSheetAnalInferenceEntity.uuid.eq(UUID.fromString(uuid)))
+            .fetchOne();

    if (Objects.isNull(analEntity)) {
      throw new EntityNotFoundException("MapSheetAnalInferenceEntity not found for analUid: ");
@@ -578,30 +608,99 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
  @Override
  public Long findMapSheetAnalInferenceUid(Integer compareYyyy, Integer targetYyyy, Integer stage) {
    return queryFactory
-      .select(mapSheetAnalInferenceEntity.id)
-      .from(mapSheetAnalInferenceEntity)
-      .where(
-        mapSheetAnalInferenceEntity.compareYyyy.eq(compareYyyy),
-        mapSheetAnalInferenceEntity.targetYyyy.eq(targetYyyy),
-        mapSheetAnalInferenceEntity.stage.eq(stage))
-      .fetchOne();
+        .select(mapSheetAnalInferenceEntity.id)
+        .from(mapSheetAnalInferenceEntity)
+        .where(
+            mapSheetAnalInferenceEntity.compareYyyy.eq(compareYyyy),
+            mapSheetAnalInferenceEntity.targetYyyy.eq(targetYyyy),
+            mapSheetAnalInferenceEntity.stage.eq(stage))
+        .fetchOne();
  }

  @Override
  public void insertInspector(Long analUid, String inspector) {
    queryFactory
-      .insert(labelingInspectorEntity)
-      .columns(
-        labelingInspectorEntity.operatorUid,
-        labelingInspectorEntity.analUid,
-        labelingInspectorEntity.inspectorUid)
-      .values(UUID.randomUUID(), analUid, inspector)
-      .execute();
+        .insert(labelingInspectorEntity)
+        .columns(
+            labelingInspectorEntity.operatorUid,
+            labelingInspectorEntity.analUid,
+            labelingInspectorEntity.inspectorUid)
+        .values(UUID.randomUUID(), analUid, inspector)
+        .execute();

    em.flush();
    em.clear();
  }

+  @Override
+  public ProjectInfo findProjectInfo(Long analUid) {
+    if (analUid == null) {
+      return null;
+    }
+
+    var result = queryFactory
+        .select(
+            mapSheetAnalEntity.compareYyyy,
+            mapSheetAnalEntity.targetYyyy,
+            mapSheetAnalEntity.analTitle,
+            mapSheetAnalEntity.gukyuinApplyDttm,
+            mapSheetAnalEntity.analStrtDttm
+        )
+        .from(mapSheetAnalEntity)
+        .where(mapSheetAnalEntity.id.eq(analUid))
+        .fetchOne();
+
+    if (result == null) {
+      return null;
+    }
+
+    Integer compareYyyy = result.get(mapSheetAnalEntity.compareYyyy);
+    Integer targetYyyy = result.get(mapSheetAnalEntity.targetYyyy);
+    String analTitle = result.get(mapSheetAnalEntity.analTitle);
+    ZonedDateTime gukyuinApplyDttm = result.get(mapSheetAnalEntity.gukyuinApplyDttm);
+    ZonedDateTime analStrtDttm = result.get(mapSheetAnalEntity.analStrtDttm);
+
+    // 변화탐지년도 생성
+    String detectionYear = (compareYyyy != null && targetYyyy != null)
+        ? compareYyyy + "-" + targetYyyy
+        : null;
+
+    // 회차 추출 (예: "8회차" → "8")
+    String round = extractRoundFromTitle(analTitle);
+
+    return ProjectInfo.builder()
+        .detectionYear(detectionYear)
+        .round(round)
+        .reflectionDate(formatDate(gukyuinApplyDttm))
+        .startDate(formatDate(analStrtDttm))
+        .build();
+  }
+
+  /**
+   * 제목에서 회차 숫자 추출
+   * 예: "8회차", "제8회차" → "8"
+   */
+  private String extractRoundFromTitle(String title) {
+    if (title == null || title.isEmpty()) {
+      return null;
+    }
+
+    Pattern pattern = Pattern.compile("(\\d+)회차");
+    Matcher matcher = pattern.matcher(title);
+
+    return matcher.find() ? matcher.group(1) : null;
+  }
+
+  /**
+   * ZonedDateTime을 "yyyy-MM-dd" 형식으로 변환
+   */
+  private String formatDate(ZonedDateTime dateTime) {
+    if (dateTime == null) {
+      return null;
+    }
+    return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+  }
+
  @Override
  public Page<LabelingStatDto> findLabelerDailyStat(LabelAllocateDto.searchReq searchReq, String uuid, String userId) {
    // 날짜 포맷