Merge pull request '[2133]' (#483) from dev into dev-deploy

Reviewed-on: #483

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()));
       }
 
@@ -2745,7 +2746,7 @@ public class EstimateService {
           sb.append("<td style='width:120px;text-align:left;'>")
               .append(StringUtils.defaultString(itemResponse.getItemName()))
               .append("</td>");
-          sb.append("<td style='width:120px;'>")
+          sb.append("<td style='width:120px;text-align:left;'>")
               .append(StringUtils.defaultString(itemResponse.getItemNo()))
               .append("</td>");
           sb.append("<td style='width:60px;text-align:right;'>").append(amountStr).append("</td>");

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()));
       }