Merge remote-tracking branch 'origin/feat/dev_251201' 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/label/dto/LabelAllocateDto.java

@@ -8,7 +8,11 @@ import java.util.List;
 import java.util.UUID;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Sort;
 
 public class LabelAllocateDto {
 
@@ -171,6 +175,9 @@ public class LabelAllocateDto {
     private Long analUid;
     private ZonedDateTime createdDttm;
     private ZonedDateTime updatedDttm;
+    private String inspectState;
+    private ZonedDateTime workStatDttm;
+    private ZonedDateTime inspectStatDttm;
   }
 
   @Getter
@@ -210,7 +217,7 @@ public class LabelAllocateDto {
     private Double percent;
     private Integer ranking;
     private ZonedDateTime createdDttm;
-    private String inspectorName;
+    private String ownerName;
   }
 
   @Getter
@@ -256,4 +263,42 @@ public class LabelAllocateDto {
     private Long geoUid;
     private Long mapSheetNum;
   }
+
+  @Getter
+  @Setter
+  @AllArgsConstructor
+  public static class LabelingStatDto {
+
+    private String workDate;
+    private Long dailyTotalCnt;
+    private Long totalCnt;
+    private Long assignedCnt;
+    private Long skipCnt;
+    private Long completeCnt;
+    private Long remainCnt;
+  }
+
+  @Schema(name = "searchReq", description = "일자별 작업 목록 요청")
+  @Getter
+  @Setter
+  @NoArgsConstructor
+  @AllArgsConstructor
+  public static class searchReq {
+
+    // 페이징 파라미터
+    private int page = 0;
+    private int size = 20;
+    private String sort;
+
+    public Pageable toPageable() {
+      if (sort != null && !sort.isEmpty()) {
+        String[] sortParams = sort.split(",");
+        String property = sortParams[0];
+        Sort.Direction direction =
+            sortParams.length > 1 ? Sort.Direction.fromString(sortParams[1]) : Sort.Direction.ASC;
+        return PageRequest.of(page, size, Sort.by(direction, property));
+      }
+      return PageRequest.of(page, size);
+    }
+  }
 }

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

@@ -1,10 +1,12 @@
 package com.kamco.cd.kamcoback.label.dto;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import com.kamco.cd.kamcoback.common.utils.enums.Enums;
 import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm;
 import com.kamco.cd.kamcoback.label.dto.LabelAllocateDto.LabelMngState;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.time.ZonedDateTime;
+import java.util.UUID;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -14,6 +16,15 @@ import org.springframework.data.domain.Pageable;
 
 public class LabelWorkDto {
 
+  @Getter
+  @Setter
+  @AllArgsConstructor
+  public static class ChangeDetectYear {
+
+    private String code;
+    private String name;
+  }
+
   @Schema(name = "LabelWorkMng", description = "라벨작업관리")
   @Getter
   @Setter
@@ -21,8 +32,9 @@ public class LabelWorkDto {
   @AllArgsConstructor
   public static class LabelWorkMng {
 
-    private int compareYyyy;
-    private int targetYyyy;
+    private UUID uuid;
+    private Integer compareYyyy;
+    private Integer targetYyyy;
     private int stage;
     @JsonFormatDttm private ZonedDateTime createdDttm;
     private Long detectionTotCnt;
@@ -32,6 +44,14 @@ public class LabelWorkDto {
     private Long labelCompleteTotCnt;
     @JsonFormatDttm private ZonedDateTime labelStartDttm;
 
+    @JsonProperty("detectYear")
+    public String getDetectYear() {
+      if (compareYyyy == null || targetYyyy == null) {
+        return null;
+      }
+      return compareYyyy + "-" + targetYyyy;
+    }
+
     public String getLabelState() {
 
       String mngState = "PENDING";
@@ -65,6 +85,20 @@ public class LabelWorkDto {
     }
   }
 
+  @Getter
+  @Setter
+  @AllArgsConstructor
+  @NoArgsConstructor
+  public static class LabelWorkMngDetail {
+
+    private String detectionYear;
+    private Integer stage;
+    @JsonFormatDttm private ZonedDateTime createdDttm;
+    private Long labelTotCnt;
+    private Long labeler;
+    private Long reviewer;
+  }
+
   @Schema(name = "LabelWorkMngSearchReq", description = "라벨작업관리 검색 요청")
   @Getter
   @Setter
@@ -80,7 +114,7 @@ public class LabelWorkDto {
     private int size = 20;
 
     @Schema(description = "변화탐지년도", example = "2024")
-    private Integer detectYyyy;
+    private String detectYear;
 
     @Schema(description = "시작일", example = "20260101")
     private String strtDttm;

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

@@ -67,23 +67,17 @@ public class WorkerStatsDto {
     private Boolean isStagnated;
 
     // 레거시 필드 (기존 호환성 유지)
-    @Deprecated
-    private Long doneCnt; // completed로 대체
+    @Deprecated private Long doneCnt; // completed로 대체
 
-    @Deprecated
-    private Long skipCnt; // skipped로 대체
+    @Deprecated private Long skipCnt; // skipped로 대체
 
-    @Deprecated
-    private Long remainingCnt; // remaining으로 대체
+    @Deprecated private Long remainingCnt; // remaining으로 대체
 
-    @Deprecated
-    private Long day3AgoDoneCnt; // history.day3Ago로 대체
+    @Deprecated private Long day3AgoDoneCnt; // history.day3Ago로 대체
 
-    @Deprecated
-    private Long day2AgoDoneCnt; // history.day2Ago로 대체
+    @Deprecated private Long day2AgoDoneCnt; // history.day2Ago로 대체
 
-    @Deprecated
-    private Long day1AgoDoneCnt; // history.day1Ago로 대체
+    @Deprecated private Long day1AgoDoneCnt; // history.day1Ago로 대체
   }
 
   @Getter
@@ -107,7 +101,6 @@ public class WorkerStatsDto {
     private Long average;
   }
 
-
   @Getter
   @Setter
   @Builder