diff --git a/src/main/java/com/kamco/cd/kamcoback/label/dto/WorkerStatsDto.java b/src/main/java/com/kamco/cd/kamcoback/label/dto/WorkerStatsDto.java index 9d03e89e..e7a3e035 100644 --- a/src/main/java/com/kamco/cd/kamcoback/label/dto/WorkerStatsDto.java +++ b/src/main/java/com/kamco/cd/kamcoback/label/dto/WorkerStatsDto.java @@ -1,6 +1,8 @@ package com.kamco.cd.kamcoback.label.dto; +import com.kamco.cd.kamcoback.common.utils.interfaces.JsonFormatDttm; import io.swagger.v3.oas.annotations.media.Schema; +import java.time.ZonedDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Getter; @@ -21,13 +23,15 @@ public class WorkerStatsDto { private String detectionYear; @Schema(description = "회차 (예: 8)") - private String round; + private String stage; @Schema(description = "국유인 반영일 (예: 2026-03-31)") - private String reflectionDate; + @JsonFormatDttm + private ZonedDateTime gukyuinApplyDttm; @Schema(description = "작업 시작일 (예: 2026-04-06)") - private String startDate; + @JsonFormatDttm + private ZonedDateTime startDttm; @Schema(description = "프로젝트 UUID") private String uuid; 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 c7c7d737..fa94a7b5 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 @@ -37,7 +37,6 @@ 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; @@ -676,9 +675,9 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto return ProjectInfo.builder() .detectionYear(detectionYear) - .round(round) - .reflectionDate(formatDate(gukyuinApplyDttm)) - .startDate(formatDate(createdDttm)) + .stage(round) + .gukyuinApplyDttm(gukyuinApplyDttm) + .startDttm(createdDttm) .uuid(uuid != null ? uuid.toString() : null) .build(); } @@ -723,21 +722,13 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto return ProjectInfo.builder() .detectionYear(detectionYear) - .round(round) - .reflectionDate(formatDate(gukyuinApplyDttm)) - .startDate(formatDate(createdDttm)) + .stage(round) + .gukyuinApplyDttm(gukyuinApplyDttm) + .startDttm(createdDttm) .uuid(uuid != null ? uuid.toString() : null) .build(); } - /** 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 findLabelerDailyStat( LabelAllocateDto.searchReq searchReq, String uuid, String userId) {