diff --git a/src/main/java/com/onnoff/onnoff/domain/on/resolution/converter/ResolutionConverter.java b/src/main/java/com/onnoff/onnoff/domain/on/resolution/converter/ResolutionConverter.java index 1f01e44..6e3ccba 100644 --- a/src/main/java/com/onnoff/onnoff/domain/on/resolution/converter/ResolutionConverter.java +++ b/src/main/java/com/onnoff/onnoff/domain/on/resolution/converter/ResolutionConverter.java @@ -23,6 +23,7 @@ public static Resolution toAddResolution(Long order, ResolutionRequest.AddResolu public static ResolutionResponse.AddResultDTO toAddResolutionResultDTO(Resolution resolution){ return ResolutionResponse.AddResultDTO.builder() .resolutionId(resolution.getId()) + .date(resolution.getDate()) .order(resolution.getOrder()) .content(resolution.getContent()) .createdAt(resolution.getCreatedAt()) diff --git a/src/main/java/com/onnoff/onnoff/domain/on/resolution/dto/ResolutionResponse.java b/src/main/java/com/onnoff/onnoff/domain/on/resolution/dto/ResolutionResponse.java index c7f27f2..8d2cfe4 100644 --- a/src/main/java/com/onnoff/onnoff/domain/on/resolution/dto/ResolutionResponse.java +++ b/src/main/java/com/onnoff/onnoff/domain/on/resolution/dto/ResolutionResponse.java @@ -16,6 +16,7 @@ public class ResolutionResponse { @AllArgsConstructor public static class AddResultDTO{ Long resolutionId; + LocalDate date; Integer order; String content; LocalDateTime createdAt; diff --git a/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/OnConverter.java b/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/OnConverter.java index d37a58a..80eb533 100644 --- a/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/OnConverter.java +++ b/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/OnConverter.java @@ -37,6 +37,7 @@ public static OnResponse.OnViewDTO getOnDTO(Long userId, LocalDate date, List worklogDTOList = worklogList.stream() .map(worklog -> WorklogResponse.WorklogDTO.builder() .worklogId(worklog.getId()) + .date(worklog.getDate()) .content(worklog.getContent()) .isChecked(worklog.getIsChecked()) .build()) diff --git a/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/WorklogConverter.java b/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/WorklogConverter.java index 9635c51..59de109 100644 --- a/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/WorklogConverter.java +++ b/src/main/java/com/onnoff/onnoff/domain/on/worklog/converter/WorklogConverter.java @@ -23,6 +23,7 @@ public static List toWorklogViewDTO(List wo return worklogList.stream() .map(worklog -> WorklogResponse.WorklogDTO.builder() .worklogId(worklog.getId()) + .date(worklog.getDate()) .content(worklog.getContent()) .isChecked(worklog.getIsChecked()) .build()) @@ -32,6 +33,7 @@ public static List toWorklogViewDTO(List wo public static WorklogResponse.AddResultDTO toAddWorklogResultDTO(Worklog worklog) { return WorklogResponse.AddResultDTO.builder() .worklogId(worklog.getId()) + .date(worklog.getDate()) .content(worklog.getContent()) .isChecked(worklog.getIsChecked()) .createdAt(worklog.getCreatedAt()) diff --git a/src/main/java/com/onnoff/onnoff/domain/on/worklog/dto/WorklogResponse.java b/src/main/java/com/onnoff/onnoff/domain/on/worklog/dto/WorklogResponse.java index 522bfd9..68d4fae 100644 --- a/src/main/java/com/onnoff/onnoff/domain/on/worklog/dto/WorklogResponse.java +++ b/src/main/java/com/onnoff/onnoff/domain/on/worklog/dto/WorklogResponse.java @@ -15,6 +15,7 @@ public class WorklogResponse { @AllArgsConstructor public static class AddResultDTO{ Long worklogId; + LocalDate date; String content; Boolean isChecked; LocalDateTime createdAt; @@ -38,6 +39,7 @@ public static class ModifyResultDTO{ @AllArgsConstructor public static class WorklogDTO{ Long worklogId; + LocalDate date; String content; Boolean isChecked; }