Merge pull request '작업현황 관리 조회 수정' (#145) from feat/dev_251201 into develop
Reviewed-on: https://kamco.gitea.gs.dabeeo.com/dabeeo/kamco-dabeeo-backoffice/pulls/145
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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<LabelingStatDto> findLabelerDailyStat(
|
||||
LabelAllocateDto.searchReq searchReq, String uuid, String userId) {
|
||||
|
||||
Reference in New Issue
Block a user