diff --git a/nw/src/main/java/lab/cherry/nw/model/QsheetEntity.java b/nw/src/main/java/lab/cherry/nw/model/QsheetEntity.java index cfee295..b5a4237 100644 --- a/nw/src/main/java/lab/cherry/nw/model/QsheetEntity.java +++ b/nw/src/main/java/lab/cherry/nw/model/QsheetEntity.java @@ -61,7 +61,8 @@ public class QsheetEntity implements Serializable { private Instant created_at; @JsonProperty("wedding_date") - @JsonFormat(pattern="yyyy-MM-dd hh:mm:ss", locale = "ko_KR", timezone = "Asia/Seoul") + @JsonFormat(locale = "ko_KR", timezone = "Asia/Seoul") + // @JsonFormat(pattern="yyyy-MM-dd hh:mm:ss", locale = "ko_KR", timezone = "Asia/Seoul") @Schema(title = "결혼식 날짜", example = "2023-07-04 12:00:00") private String wedding_date; diff --git a/nw/src/main/java/lab/cherry/nw/service/Impl/QsheetServiceImpl.java b/nw/src/main/java/lab/cherry/nw/service/Impl/QsheetServiceImpl.java index 309c982..f90c763 100644 --- a/nw/src/main/java/lab/cherry/nw/service/Impl/QsheetServiceImpl.java +++ b/nw/src/main/java/lab/cherry/nw/service/Impl/QsheetServiceImpl.java @@ -161,7 +161,7 @@ public QsheetEntity createQsheet(QsheetEntity.QsheetCreateDto qsheetCreateDto, L .client_confirm(false) // .finalConfirm(FinalConfirm.builder().build()) .created_at(instant) - .wedding_date(userCardEntity!=null? userCardEntity.getWeddingDate() : "") + .wedding_date(userCardEntity!=null? userCardEntity.getWeddingDate() : null) .build(); qsheetRepository.save(qsheetEntity); qsheetLogService.createQsheetLog("create", qsheetEntity); @@ -259,7 +259,7 @@ public void updateById(String id, QsheetEntity.QsheetUpdateDto qsheetUpdateDto, .org(orgEntity) .user(qsheetEntity.getUser()) .created_at(qsheetEntity.getCreated_at()) - .wedding_date(userCardEntity!=null? userCardEntity.getWeddingDate() : "") + .wedding_date(userCardEntity!=null? userCardEntity.getWeddingDate() : null) .data(qsheetUpdateDto.getData()!=null?newItemData:qsheetEntity.getData()) .org_approver(orgUserEntity) .org_confirm(qsheetUpdateDto.isOrg_confirm()==!(qsheetEntity.isOrg_confirm())?qsheetUpdateDto.isOrg_confirm():qsheetEntity.isOrg_confirm())