Compare commits

..

No commits in common. "f7bd9b1d3a811e584072fcc90d208f14e812349e" and "088544762749eb3b68421a288597ead472e00ca2" have entirely different histories.

4 changed files with 3 additions and 6 deletions

View File

@ -1369,8 +1369,7 @@ public class EstimateService {
// file Name 명이 없는경우 // file Name 명이 없는경우
if (estimateRequest.getFileName() == null || "".equals(estimateRequest.getFileName())) { if (estimateRequest.getFileName() == null || "".equals(estimateRequest.getFileName())) {
estimateRequest.setFileName(StringUtils.defaultString(estimateResponse.getObjectNo()) + "_" estimateRequest.setFileName(estimateResponse.getObjectNo() + "_"
+ StringUtils.defaultString(estimateResponse.getPlanNo()) + "_"
+ new SimpleDateFormat("yyyyMMdd").format(new Date())); + new SimpleDateFormat("yyyyMMdd").format(new Date()));
} }
@ -2746,7 +2745,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;text-align:left;'>") sb.append("<td style='width:120px;'>")
.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>");

View File

@ -2503,9 +2503,7 @@ 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(
StringUtils.defaultString(estimateResponse.getObjectNo()) estimateResponse.getObjectNo()
+ "_"
+ StringUtils.defaultString(estimateResponse.getPlanNo())
+ "_" + "_"
+ new SimpleDateFormat("yyyyMMdd").format(new Date())); + new SimpleDateFormat("yyyyMMdd").format(new Date()));
} }