Merge remote-tracking branch 'origin/feat/dev_251201' into feat/dev_251201

src/main/java/com/kamco/cd/kamcoback/label/dto/LabelAllocateDto.java

@@ -87,22 +87,13 @@ public class LabelAllocateDto {
   @AllArgsConstructor
   public static class AllocateDto {
 
-    //    @Schema(description = "분석 ID", example = "3")
-    //    private Long analUid;
-
     @Schema(description = "비교년도", example = "2022", required = true)
     private Integer compareYyyy;
 
     @Schema(description = "기준년도", example = "2024", required = true)
     private Integer targetYyyy;
 
-    @Schema(description = "라벨러 자동/수동여부(AUTO/MANUAL)", example = "AUTO")
-    private String labelerAutoType;
-
-    @Schema(description = "검수자 자동/수동여부(AUTO/MANUAL)", example = "AUTO")
-    private String inspectorAutoType;
-
-    @Schema(description = "회차", example = "4")
+    @Schema(description = "회차", example = "4", required = true)
     private Integer stage;
 
     @Schema(
@@ -130,22 +121,12 @@ public class LabelAllocateDto {
         description = "검수자 할당 목록",
         example =
             """
-          [
-             {
-               "inspectorUid": "K20251216001",
-               "userCount": 1000
-             },
-             {
-                   "inspectorUid": "01022225555",
-                   "userCount": 340
-                 },
-             {
-               "inspectorUid": "K20251212001",
-               "userCount": 500
-             }
+          ["K20251216001",
+           "01022225555",
+           "K20251212001"
           ]
           """)
-    private List<TargetInspector> inspectors;
+    private List<String> inspectors;
   }
 
   @Getter
@@ -273,6 +254,6 @@ public class LabelAllocateDto {
   public static class AllocateInfoDto {
 
     private Long geoUid;
-    private String mapSheetNum;
+    private Long mapSheetNum;
   }
 }

src/main/java/com/kamco/cd/kamcoback/label/dto/LabelInspectorDto.java

@@ -0,0 +1,22 @@
+package com.kamco.cd.kamcoback.label.dto;
+
+import java.time.ZonedDateTime;
+import java.util.UUID;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.Setter;
+
+public class LabelInspectorDto {
+
+  @Getter
+  @Setter
+  @AllArgsConstructor
+  public static class Basic {
+
+    private UUID operatorUid;
+    private Long analUid;
+    private String inspectorUid;
+    private ZonedDateTime createdDttm;
+    private ZonedDateTime updatedDttm;
+  }
+}

src/main/java/com/kamco/cd/kamcoback/label/dto/WorkerStatsDto.java

@@ -10,6 +10,27 @@ import lombok.Setter;
 
 public class WorkerStatsDto {
 
+  @Getter
+  @Setter
+  @Builder
+  @NoArgsConstructor
+  @AllArgsConstructor
+  @Schema(description = "프로젝트 기본 정보 (상단 표시용)")
+  public static class ProjectInfo {
+
+    @Schema(description = "변화탐지년도 (예: 2026-2025)")
+    private String detectionYear;
+
+    @Schema(description = "회차 (예: 8)")
+    private String round;
+
+    @Schema(description = "국유인 반영일 (예: 2026-03-31)")
+    private String reflectionDate;
+
+    @Schema(description = "작업 시작일 (예: 2026-04-06)")
+    private String startDate;
+  }
+
   @Getter
   @Setter
   @Builder
@@ -61,29 +82,74 @@ public class WorkerStatsDto {
   @Schema(description = "작업 진행 현황 정보")
   public static class WorkProgressInfo {
 
+    // === 라벨링 관련 ===
     @Schema(description = "라벨링 진행률 (완료건+스킵건)/배정건")
     private Double labelingProgressRate;
 
-    @Schema(description = "작업 상태 (진행중/종료)")
-    private String workStatus;
+    @Schema(description = "라벨링 작업 상태 (진행중/완료)")
+    private String labelingStatus;
 
-    @Schema(description = "진행률 수치 (완료+스킵)")
-    private Long completedCount;
+    @Schema(description = "라벨링 전체 배정 건수")
+    private Long labelingTotalCount;
 
-    @Schema(description = "전체 배정 건수")
-    private Long totalAssignedCount;
+    @Schema(description = "라벨링 완료 건수 (LABEL_FIN + TEST_ING + DONE)")
+    private Long labelingCompletedCount;
+
+    @Schema(description = "라벨링 스킵 건수 (SKIP)")
+    private Long labelingSkipCount;
+
+    @Schema(description = "라벨링 남은 작업 건수")
+    private Long labelingRemainingCount;
 
     @Schema(description = "투입된 라벨러 수")
     private Long labelerCount;
 
-    @Schema(description = "남은 라벨링 작업 데이터 수")
-    private Long remainingLabelCount;
+    // === 검수(Inspection) 관련 (신규 추가) ===
+    @Schema(description = "검수 진행률 (완료건/대상건)")
+    private Double inspectionProgressRate;
+
+    @Schema(description = "검수 작업 상태 (진행중/완료)")
+    private String inspectionStatus;
+
+    @Schema(description = "검수 전체 대상 건수")
+    private Long inspectionTotalCount;
+
+    @Schema(description = "검수 완료 건수 (DONE)")
+    private Long inspectionCompletedCount;
+
+    @Schema(description = "검수 제외 건수 (라벨링 스킵과 동일)")
+    private Long inspectionSkipCount;
+
+    @Schema(description = "검수 남은 작업 건수")
+    private Long inspectionRemainingCount;
 
     @Schema(description = "투입된 검수자 수")
     private Long inspectorCount;
 
-    @Schema(description = "남은 검수 작업 데이터 수")
+    // === 레거시 호환 필드 (Deprecated) ===
+    @Deprecated
+    @Schema(description = "[Deprecated] labelingProgressRate 사용 권장")
+    private Double progressRate;
+
+    @Deprecated
+    @Schema(description = "[Deprecated] labelingTotalCount 사용 권장")
+    private Long totalAssignedCount;
+
+    @Deprecated
+    @Schema(description = "[Deprecated] labelingCompletedCount 사용 권장")
+    private Long completedCount;
+
+    @Deprecated
+    @Schema(description = "[Deprecated] labelingRemainingCount 사용 권장")
+    private Long remainingLabelCount;
+
+    @Deprecated
+    @Schema(description = "[Deprecated] inspectionRemainingCount 사용 권장")
     private Long remainingInspectCount;
+
+    @Deprecated
+    @Schema(description = "[Deprecated] labelingStatus/inspectionStatus 사용 권장")
+    private String workStatus;
   }
 
   @Getter
@@ -94,10 +160,25 @@ public class WorkerStatsDto {
   @Schema(description = "작업자 목록 응답 (작업 정보 포함)")
   public static class WorkerListResponse {
 
+    @Schema(description = "프로젝트 기본 정보 (상단 표시용)")
+    private ProjectInfo projectInfo;
+
     @Schema(description = "작업 진행 현황 정보")
     private WorkProgressInfo progressInfo;
 
     @Schema(description = "작업자 목록")
     private List<WorkerStatistics> workers;
+
+    @Schema(description = "현재 페이지 번호 (0부터 시작)")
+    private Integer currentPage;
+
+    @Schema(description = "페이지 크기")
+    private Integer pageSize;
+
+    @Schema(description = "전체 데이터 수")
+    private Long totalElements;
+
+    @Schema(description = "전체 페이지 수")
+    private Integer totalPages;
   }
 }