From c38af81ad5b0c5ce6d2657210404af2f9b83f0f7 Mon Sep 17 00:00:00 2001
From: ysCha <yscha@interplug.co.kr>
Date: Wed, 11 Mar 2026 17:21:09 +0900
Subject: [PATCH] =?UTF-8?q?[1470]=20=EB=B0=B0=EC=B9=98=EB=8F=84=C2=B7?=
 =?UTF-8?q?=EA=B3=84=ED=86=B5=EB=8F=84=20=EB=B0=8F=20=EA=B5=AC=EC=A1=B0?=
 =?UTF-8?q?=EB=8F=84=EC=9D=98=20=ED=99=94=EC=A7=88=20=EA=B0=9C=EC=84=A0=20?=
 =?UTF-8?q?cell=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qcast/biz/estimate/EstimateService.java   | 22 +++++++++++++++++--
 .../biz/estimate/dto/EstimateResponse.java    | 10 +++++++--
 2 files changed, 28 insertions(+), 4 deletions(-)

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 7623258a..7be260bf 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
@@ -1603,6 +1603,7 @@ public class EstimateService {
       // 도면 이미지 셋팅
       String baseDrawingImgName = estimateRequest.getObjectNo() + "_" + estimateRequest.getPlanNo();
 
+      // 풀사이즈 이미지 (P1, P2 시트용)
       URL url = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_1.png");
       byte[] drawingImg1 = loadDrawingImage(url);
       if (drawingImg1 != null) {
@@ -1610,14 +1611,31 @@ public class EstimateService {
       }
       log.debug("url1 ::: {}", url);
 
-      String baseDrawingImgName2 = estimateRequest.getObjectNo() + "_" + estimateRequest.getPlanNo();
-      URL url2 = new URL(drawingDirPath + File.separator + baseDrawingImgName2 + "_2.png");
+      URL url2 = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_2.png");
       byte[] drawingImg2 = loadDrawingImage(url2);
       if (drawingImg2 != null) {
         estimateResponse.setDrawingImg2(drawingImg2);
       }
       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);
+      } else {
+        // cell 이미지가 없으면 풀사이즈로 폴백
+        estimateResponse.setDrawingImg1Cell(drawingImg1);
+      }
+
+      URL urlCell2 = new URL(drawingDirPath + File.separator + baseDrawingImgName + "_2_cell.png");
+      byte[] drawingImg2Cell = loadDrawingImage(urlCell2);
+      if (drawingImg2Cell != null) {
+        estimateResponse.setDrawingImg2Cell(drawingImg2Cell);
+      } else {
+        estimateResponse.setDrawingImg2Cell(drawingImg2);
+      }
+
 
       //userId 에 따른 영업점 주소, 전화, fax 정보 조회
       if(estimateRequest.getSaleStoreId() != null && "T01".equals(estimateRequest.getSaleStoreId())){
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 56d442c1..5b79dcb8 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,12 +221,18 @@ 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 = "도면이미지2 (셀범위용)")
+  private byte[] drawingImg2Cell;
+
   // 판매점 정보
   @Schema(description = "고객 판매점명")
   private String custSaleStoreName;