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 8d39b40f..937dd532 100644
--- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
+++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
@@ -1369,7 +1369,8 @@ public class EstimateService {
// file Name 명이 없는경우
if (estimateRequest.getFileName() == null || "".equals(estimateRequest.getFileName())) {
- estimateRequest.setFileName(estimateResponse.getObjectNo() + "_"
+ estimateRequest.setFileName(StringUtils.defaultString(estimateResponse.getObjectNo()) + "_"
+ + StringUtils.defaultString(estimateResponse.getPlanNo()) + "_"
+ new SimpleDateFormat("yyyyMMdd").format(new Date()));
}
@@ -2446,7 +2447,7 @@ public class EstimateService {
"
" + StringUtils.defaultString(itemResponse.getNo()) + " | ");
sb.append(""
+ StringUtils.defaultString(itemResponse.getItemName()) + " | ");
- sb.append("" + StringUtils.defaultString(itemResponse.getItemNo())
+ sb.append(" | " + StringUtils.defaultString(itemResponse.getItemNo())
+ " | ");
sb.append(
""
@@ -2464,7 +2465,7 @@ public class EstimateService {
sb.append(" | ");
sb.append("| " + StringUtils.defaultString(data.getPkgNo()) + " | ");
sb.append("住宅 PKG | ");
- sb.append("- | ");
+ sb.append("- | ");
sb.append(""
+ StringUtils.defaultString(data.getPkgAsp()) + " | ");
sb.append(""
@@ -2745,7 +2746,7 @@ public class EstimateService {
sb.append(" | ")
.append(StringUtils.defaultString(itemResponse.getItemName()))
.append(" | ");
- sb.append("")
+ sb.append(" | ")
.append(StringUtils.defaultString(itemResponse.getItemNo()))
.append(" | ");
sb.append("").append(amountStr).append(" | ");
diff --git a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java
index f91ee097..39f6c618 100644
--- a/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java
+++ b/src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java
@@ -2503,7 +2503,9 @@ public class PwrGnrSimService {
// file Name 명이 없는경우
if (estimateRequest.getFileName() == null || "".equals(estimateRequest.getFileName())) {
estimateRequest.setFileName(
- estimateResponse.getObjectNo()
+ StringUtils.defaultString(estimateResponse.getObjectNo())
+ + "_"
+ + StringUtils.defaultString(estimateResponse.getPlanNo())
+ "_"
+ new SimpleDateFormat("yyyyMMdd").format(new Date()));
}
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 b0b9ace1..d976c525 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
diff --git a/src/main/resources/template/excel/excel_download_quotation_detail_template2.xlsx b/src/main/resources/template/excel/excel_download_quotation_detail_template2.xlsx
index c9f5ae2d..1ba2927c 100644
Binary files a/src/main/resources/template/excel/excel_download_quotation_detail_template2.xlsx and b/src/main/resources/template/excel/excel_download_quotation_detail_template2.xlsx differ