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

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;