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 7be260bf..ea123bdf 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -1603,7 +1603,7 @@ public class EstimateService { // 도면 이미지 셋팅 String baseDrawingImgName = estimateRequest.getObjectNo() + "_" + estimateRequest.getPlanNo(); - // 풀사이즈 이미지 (P1, P2 시트용) + // 셀범위용 이미지 (기존 이미지명 유지: _1.png, _2.png) URL url = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1.png"); byte[] drawingImg1 = loadDrawingImage(url); if (drawingImg1 != null) { @@ -1618,22 +1618,22 @@ public class EstimateService { } log.debug("url2 ::: {}", url2); - // 셀범위용 이미지 (割付図・系統図, 架台図 시트용) - URL urlCell1 = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1_cell.png"); - byte[] drawingImg1Cell = loadDrawingImage(urlCell1); - if (drawingImg1Cell != null) { - estimateResponse.setDrawingImg1Cell(drawingImg1Cell); + // 풀사이즈 이미지 (P1, P2 시트용: _1_full.png, _2_full.png) + URL urlFull1 = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1_full.png"); + byte[] drawingImg1Full = loadDrawingImage(urlFull1); + if (drawingImg1Full != null) { + estimateResponse.setDrawingImg1Full(drawingImg1Full); } else { - // cell 이미지가 없으면 풀사이즈로 폴백 - estimateResponse.setDrawingImg1Cell(drawingImg1); + // full 이미지가 없으면 기존 이미지로 폴백 + estimateResponse.setDrawingImg1Full(drawingImg1); } - URL urlCell2 = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_2_cell.png"); - byte[] drawingImg2Cell = loadDrawingImage(urlCell2); - if (drawingImg2Cell != null) { - estimateResponse.setDrawingImg2Cell(drawingImg2Cell); + URL urlFull2 = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_2_full.png"); + byte[] drawingImg2Full = loadDrawingImage(urlFull2); + if (drawingImg2Full != null) { + estimateResponse.setDrawingImg2Full(drawingImg2Full); } else { - estimateResponse.setDrawingImg2Cell(drawingImg2); + estimateResponse.setDrawingImg2Full(drawingImg2); } diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java index 5b79dcb8..c97b6ded 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java @@ -221,17 +221,17 @@ public class EstimateResponse { @Schema(description = "염해지역 아이템사용 여부") private String saltAreaFlg; - @Schema(description = "도면이미지1 (풀사이즈)") + @Schema(description = "도면이미지1 (셀범위용, 기존)") private byte[] drawingImg1; - @Schema(description = "도면이미지2 (풀사이즈)") + @Schema(description = "도면이미지2 (셀범위용, 기존)") private byte[] drawingImg2; - @Schema(description = "도면이미지1 (셀범위용)") - private byte[] drawingImg1Cell; + @Schema(description = "도면이미지1 (풀사이즈, 여백없음)") + private byte[] drawingImg1Full; - @Schema(description = "도면이미지2 (셀범위용)") - private byte[] drawingImg2Cell; + @Schema(description = "도면이미지2 (풀사이즈, 여백없음)") + private byte[] drawingImg2Full; // 판매점 정보 @Schema(description = "고객 판매점명") diff --git a/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx b/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx index 641b7687..ffbad435 100644 Binary files a/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx and b/src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx differ