MVPTeam/test
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

작업현황 관리 조회 수정

Browse Source
This commit is contained in:
teddy
2026-01-05 16:39:32 +09:00
parent c30deb5efe
commit 6e1ad0a944
2 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,8 @@
package com.kamco.cd.kamcoback.label.dto; 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 io.swagger.v3.oas.annotations.media.Schema;
import java.time.ZonedDateTime;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Getter; import lombok.Getter;
@@ -21,13 +23,15 @@ public class WorkerStatsDto {
private String detectionYear; private String detectionYear;
@Schema(description = "회차 (예: 8)") @Schema(description = "회차 (예: 8)")
private String round; private String stage;
@Schema(description = "국유인 반영일 (예: 2026-03-31)") @Schema(description = "국유인 반영일 (예: 2026-03-31)")
private String reflectionDate; @JsonFormatDttm
private ZonedDateTime gukyuinApplyDttm;
@Schema(description = "작업 시작일 (예: 2026-04-06)") @Schema(description = "작업 시작일 (예: 2026-04-06)")
private String startDate; @JsonFormatDttm
private ZonedDateTime startDttm;
@Schema(description = "프로젝트 UUID") @Schema(description = "프로젝트 UUID")
private String uuid; private String uuid;

21
src/main/java/com/kamco/cd/kamcoback/postgres/repository/label/LabelAllocateRepositoryImpl.java
View File

@@ -37,7 +37,6 @@ import java.time.LocalDate;
import java.time.LocalTime; import java.time.LocalTime;
import java.time.ZoneId; import java.time.ZoneId;
import java.time.ZonedDateTime; import java.time.ZonedDateTime;
import java.time.format.DateTimeFormatter;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.UUID; import java.util.UUID;
@@ -676,9 +675,9 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
return ProjectInfo.builder() return ProjectInfo.builder()
.detectionYear(detectionYear) .detectionYear(detectionYear)
.round(round) .stage(round)
.reflectionDate(formatDate(gukyuinApplyDttm)) .gukyuinApplyDttm(gukyuinApplyDttm)
.startDate(formatDate(createdDttm)) .startDttm(createdDttm)
.uuid(uuid != null ? uuid.toString() : null) .uuid(uuid != null ? uuid.toString() : null)
.build(); .build();
} }
@@ -723,21 +722,13 @@ public class LabelAllocateRepositoryImpl implements LabelAllocateRepositoryCusto
return ProjectInfo.builder() return ProjectInfo.builder()
.detectionYear(detectionYear) .detectionYear(detectionYear)
.round(round) .stage(round)
.reflectionDate(formatDate(gukyuinApplyDttm)) .gukyuinApplyDttm(gukyuinApplyDttm)
.startDate(formatDate(createdDttm)) .startDttm(createdDttm)
.uuid(uuid != null ? uuid.toString() : null) .uuid(uuid != null ? uuid.toString() : null)
.build(); .build();
} }
/** ZonedDateTime을 "yyyy-MM-dd" 형식으로 변환 */
private String formatDate(ZonedDateTime dateTime) {
if (dateTime == null) {
return null;
}
return dateTime.format(DateTimeFormatter.ofPattern("yyyy-MM-dd"));
}
@Override @Override
public Page<LabelingStatDto> findLabelerDailyStat( public Page<LabelingStatDto> findLabelerDailyStat(
LabelAllocateDto.searchReq searchReq, String uuid, String userId) { LabelAllocateDto.searchReq searchReq, String uuid, String userId) {