From e683b01621dc957f3a5c824ea98da7a0f856b90b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?dhji=28=EC=A7=80=EB=8C=80=ED=95=9C=29?= Date: Mon, 30 Oct 2023 13:13:05 +0900 Subject: [PATCH] =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=B0=8F=20=EC=83=81=EC=84=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../palnet/biz/api/cns/qna/controller/CnsQnaController.java | 4 +--- .../com/palnet/biz/api/cns/qna/model/QnaDetailRSModel.java | 2 +- .../com/palnet/biz/api/cns/qna/service/CnsQnaService.java | 6 ++++-- .../palnet/biz/api/external/service/SunRiseSetService.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/controller/CnsQnaController.java b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/controller/CnsQnaController.java index 01b69e33..ad159a14 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/controller/CnsQnaController.java +++ b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/controller/CnsQnaController.java @@ -16,7 +16,6 @@ import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -import javax.naming.AuthenticationException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; @@ -129,7 +128,7 @@ public class CnsQnaController { return ResponseEntity.ok().body(new SuccessResponse<>(result)); } - @PutMapping + @PutMapping(consumes = "multipart/form-data") @Tag(name = "QNA", description = "QNA 관련 API") @ApiOperation(value = "QnA 수정 - 사용자") public ResponseEntity updateQna(QnaInsertRQModel rq) { @@ -153,7 +152,6 @@ public class CnsQnaController { } - @DeleteMapping("/{qnaSno}") @Tag(name = "QNA", description = "QNA 관련 API") @ApiOperation(value = "QnA 삭제하기") diff --git a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaDetailRSModel.java b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaDetailRSModel.java index 92d85437..75d827d3 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaDetailRSModel.java +++ b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/model/QnaDetailRSModel.java @@ -45,5 +45,5 @@ public class QnaDetailRSModel { private Instant updateDt; - private List files; + private List fileInfos; } diff --git a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java index 85228310..f3f719ec 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/cns/qna/service/CnsQnaService.java @@ -62,7 +62,7 @@ public class CnsQnaService { } /** - * Qna 업데이트하기 TODO :: File 업데이트 기능 아직 구현안함 + * Qna 업데이트하기 * * @param rq * @return @@ -103,6 +103,8 @@ public class CnsQnaService { if (userId == null) userId = "NONE"; entity.setUpdateUserId(userId); + // 수정시 답변상태 미응답 상태로 변경 + entity.setAnserStatus("N"); cnsQnaBasRepository.save(entity); @@ -132,7 +134,7 @@ public class CnsQnaService { if (ptyCstmrDtl != null) model.setCreateUserNm(ptyCstmrDtl.getMemberName()); } - model.setFiles(files); + model.setFileInfos(files); return model; diff --git a/pav-server/src/main/java/com/palnet/biz/api/external/service/SunRiseSetService.java b/pav-server/src/main/java/com/palnet/biz/api/external/service/SunRiseSetService.java index 3e10cf5b..e233ab7c 100644 --- a/pav-server/src/main/java/com/palnet/biz/api/external/service/SunRiseSetService.java +++ b/pav-server/src/main/java/com/palnet/biz/api/external/service/SunRiseSetService.java @@ -63,7 +63,7 @@ public class SunRiseSetService { // continue 20240201 List locations = getLocation(); // LocalDate targetDate = LocalDate.now(); - LocalDate targetDate = LocalDate.of(2024, 3, 1); + LocalDate targetDate = LocalDate.of(2024, 4, 1); LocalDate end = targetDate.plusMonths(6); List sunRiseSet = new ArrayList<>();