qcast3/qcast-api
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

[2133][1508] #484

Merged
ysCha merged 3 commits from dev into prd-deploy 2026-05-04 11:04:15 +09:00
Conversation 0 Commits 3 Files Changed 4 +8 -5
4 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java
View File

@ -1369,7 +1369,8 @@ public class EstimateService {
// file Name 명이 없는경우 // file Name 명이 없는경우
if (estimateRequest.getFileName() == null || "".equals(estimateRequest.getFileName())) { 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())); + new SimpleDateFormat("yyyyMMdd").format(new Date()));
} }
@ -2446,7 +2447,7 @@ public class EstimateService {
"<td style='width:60px;'>" + StringUtils.defaultString(itemResponse.getNo()) + "</td>"); "<td style='width:60px;'>" + StringUtils.defaultString(itemResponse.getNo()) + "</td>");
sb.append("<td style='width:120px;text-align:left;'>" sb.append("<td style='width:120px;text-align:left;'>"
+ StringUtils.defaultString(itemResponse.getItemName()) + "</td>"); + StringUtils.defaultString(itemResponse.getItemName()) + "</td>");
sb.append("<td style='width:120px;'>" + StringUtils.defaultString(itemResponse.getItemNo()) sb.append("<td style='width:120px;text-align:left;'>" + StringUtils.defaultString(itemResponse.getItemNo())
+ "</td>"); + "</td>");
sb.append( sb.append(
"<td class='hide-column' style='width:80px;text-align:right;'>" "<td class='hide-column' style='width:80px;text-align:right;'>"
@ -2464,7 +2465,7 @@ public class EstimateService {
sb.append("<tr>"); sb.append("<tr>");
sb.append("<td style='width:60px;'>" + StringUtils.defaultString(data.getPkgNo()) + "</td>"); sb.append("<td style='width:60px;'>" + StringUtils.defaultString(data.getPkgNo()) + "</td>");
sb.append("<td style='width:120px;text-align:left;'>住宅 PKG</td>"); sb.append("<td style='width:120px;text-align:left;'>住宅 PKG</td>");
sb.append("<td style='width:120px;'>-</td>"); sb.append("<td style='width:120px;text-align:left;'>-</td>");
sb.append("<td style='width:80px;text-align:right;'>" sb.append("<td style='width:80px;text-align:right;'>"
+ StringUtils.defaultString(data.getPkgAsp()) + "</td>"); + StringUtils.defaultString(data.getPkgAsp()) + "</td>");
sb.append("<td style='width:60px;text-align:right;'>" sb.append("<td style='width:60px;text-align:right;'>"
@ -2745,7 +2746,7 @@ public class EstimateService {
sb.append("<td style='width:120px;text-align:left;'>") sb.append("<td style='width:120px;text-align:left;'>")
.append(StringUtils.defaultString(itemResponse.getItemName())) .append(StringUtils.defaultString(itemResponse.getItemName()))
.append("</td>"); .append("</td>");
sb.append("<td style='width:120px;'>") sb.append("<td style='width:120px;text-align:left;'>")
.append(StringUtils.defaultString(itemResponse.getItemNo())) .append(StringUtils.defaultString(itemResponse.getItemNo()))
.append("</td>"); .append("</td>");
sb.append("<td style='width:60px;text-align:right;'>").append(amountStr).append("</td>"); sb.append("<td style='width:60px;text-align:right;'>").append(amountStr).append("</td>");

4
src/main/java/com/interplug/qcast/biz/pwrGnrSimulation/PwrGnrSimService.java
View File

@ -2503,7 +2503,9 @@ public class PwrGnrSimService {
// file Name 명이 없는경우 // file Name 명이 없는경우
if (estimateRequest.getFileName() == null || "".equals(estimateRequest.getFileName())) { if (estimateRequest.getFileName() == null || "".equals(estimateRequest.getFileName())) {
estimateRequest.setFileName( estimateRequest.setFileName(
estimateResponse.getObjectNo() StringUtils.defaultString(estimateResponse.getObjectNo())
+ "_"
+ StringUtils.defaultString(estimateResponse.getPlanNo())
+ "_" + "_"
+ new SimpleDateFormat("yyyyMMdd").format(new Date())); + new SimpleDateFormat("yyyyMMdd").format(new Date()));
} }

BIN
src/main/resources/template/excel/excel_download_quotation_detail_template.xlsx
View File

Binary file not shown.

BIN
src/main/resources/template/excel/excel_download_quotation_detail_template2.xlsx
View File

Binary file not shown.