diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateController.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateController.java index 6fe3ec28..6e6dd1ea 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateController.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateController.java @@ -34,6 +34,13 @@ public class EstimateController { return estimateService.selectItemPriceList(priceRequest); } + @Operation(description = "견적서 특이사항 타이틀 목록을 조회한다.") + @GetMapping("/special-note-title-list") + @ResponseStatus(HttpStatus.OK) + public List selectSpecialNoteTitleList(NoteRequest noteRequest) throws Exception { + return estimateService.selectSpecialNoteTitleList(noteRequest); + } + @Operation(description = "견적서 특이사항 목록을 조회한다.") @GetMapping("/special-note-list") @ResponseStatus(HttpStatus.OK) diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java index 31d879a9..18591801 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateMapper.java @@ -42,6 +42,9 @@ public interface EstimateMapper { // 견적서 지붕재 용량 목록 조회 public List selectEstimateRoofVolList(EstimateRequest estimateRequest); + // 견적서 특이사항 타이틀 목록 조회 + public List selectEstimateNoteTitleList(NoteRequest noteRequest); + // 견적서 특이사항 목록 조회 public List selectEstimateNoteList(NoteRequest noteRequest); diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java index 781a8917..eb7c83f4 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -178,6 +178,17 @@ public class EstimateService { return response; } + /** + * 견적 특이사항 타이틀 목록 조회 + * + * @param noteRequest 견적 특이사항 조회 정보 + * @return List 견적 특이사항 목록 + * @throws Exception + */ + public List selectSpecialNoteTitleList(NoteRequest noteRequest) throws Exception { + return estimateMapper.selectEstimateNoteTitleList(noteRequest); + } + /** * 견적 특이사항 목록 조회 * @@ -618,6 +629,7 @@ public class EstimateService { estimateMapper.updateEstimateApi(estimateRequest); } } catch (Exception e) { + e.printStackTrace(); throw new QcastException(ErrorCode.INTERNAL_SERVER_ERROR); } } diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/NoteResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/NoteResponse.java index 49c931e6..1ff5d000 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/dto/NoteResponse.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/NoteResponse.java @@ -16,4 +16,7 @@ public class NoteResponse { @Schema(description = "견적특이사항") private String remarks; + + @Schema(description = "특이사항 묶음 여부") + private String pkgYn; } diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index a64823f8..62ddbfc6 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -465,6 +465,36 @@ GROUP BY T.OBJECT_NO, T.PLAN_NO, T.ROOF_NO, T.ROOF_SURFACE, T.SLOPE, T.ANGLE, T.CLASS_TYPE + +