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 1e61c381..283eb57d 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
@@ -785,10 +785,6 @@ public class EstimateService {
for (ItemResponse itemResponse : estimateItemList) {
itemResponse.setNo(String.valueOf(j++));
- System.out.println(">>>>>>>>>" + itemResponse.getSalePrice());
- System.out.println(">>>>>>>>>" + itemResponse.getAmount());
- System.out.println(">>>>>>>>>" + itemResponse.getSaleTotPrice());
-
// 문자열 통화로 변환 처리
itemResponse.setSalePrice(
String.format("%1$,.0f", Double.parseDouble(itemResponse.getSalePrice())));
@@ -844,7 +840,7 @@ public class EstimateService {
estimateResponse.setPwrGnrSim(pwrGnrSimResponse);
- if (true) { // PDF 다운로드
+ if ("PDF".equals(estimateRequest.getSchDownload())) { // PDF 다운로드
String[] arrSection = new String[5]; // TODO Section 갯수 넣기
int iSection = 0;
diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java
index 55950d59..9e72ef4d 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateRequest.java
@@ -163,6 +163,9 @@ public class EstimateRequest {
private String[] arrItemId;
// 다운로드 관련 조건
+ @Schema(description = "검색 - 다운로드 구분")
+ private String schDownload;
+
@Schema(description = "검색 - 다운로드 정가 표시여부")
private String schUnitPriceFlg;
diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml
index 01242caa..e30bdce8 100644
--- a/src/main/resources/mappers/estimate/estimateMapper.xml
+++ b/src/main/resources/mappers/estimate/estimateMapper.xml
@@ -609,11 +609,15 @@
, OBJECT_NO
, PLAN_NO
, DISP_ORDER
+
+ , PA_DISP_ORDER
+
, ITEM_ID
, ITEM_NO
, ITEM_NAME
, UNIT
, AMOUNT
+ , BOM_AMOUNT
, UNIT_PRICE
, SALE_PRICE
@@ -631,11 +635,15 @@
, #{objectNo}
, #{planNo}
, #{dispOrder}
+
+ , #{paDispOrder}
+
, #{itemId}
, #{itemNo}
, #{itemName}
, #{unit}
, #{amount}
+ , #{bomAmount}
, #{unitPrice}
, #{salePrice}
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 393ccca5..7fb041d2 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