Compare commits
No commits in common. "6ac361af6aa83703bbf4a4ab9261488ab3b80b7b" and "ab5213f3655b41d9a687196ed9788dd4d6df93ae" have entirely different histories.
6ac361af6a
...
ab5213f365
@ -1369,8 +1369,7 @@ public class EstimateService {
|
||||
|
||||
// file Name 명이 없는경우
|
||||
if (estimateRequest.getFileName() == null || "".equals(estimateRequest.getFileName())) {
|
||||
estimateRequest.setFileName(StringUtils.defaultString(estimateResponse.getObjectNo()) + "_"
|
||||
+ StringUtils.defaultString(estimateResponse.getPlanNo()) + "_"
|
||||
estimateRequest.setFileName(estimateResponse.getObjectNo() + "_"
|
||||
+ new SimpleDateFormat("yyyyMMdd").format(new Date()));
|
||||
}
|
||||
|
||||
@ -2447,7 +2446,7 @@ public class EstimateService {
|
||||
"<td style='width:60px;'>" + StringUtils.defaultString(itemResponse.getNo()) + "</td>");
|
||||
sb.append("<td style='width:120px;text-align:left;'>"
|
||||
+ StringUtils.defaultString(itemResponse.getItemName()) + "</td>");
|
||||
sb.append("<td style='width:120px;text-align:left;'>" + StringUtils.defaultString(itemResponse.getItemNo())
|
||||
sb.append("<td style='width:120px;'>" + StringUtils.defaultString(itemResponse.getItemNo())
|
||||
+ "</td>");
|
||||
sb.append(
|
||||
"<td class='hide-column' style='width:80px;text-align:right;'>"
|
||||
@ -2465,7 +2464,7 @@ public class EstimateService {
|
||||
sb.append("<tr>");
|
||||
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;'>-</td>");
|
||||
sb.append("<td style='width:120px;'>-</td>");
|
||||
sb.append("<td style='width:80px;text-align:right;'>"
|
||||
+ StringUtils.defaultString(data.getPkgAsp()) + "</td>");
|
||||
sb.append("<td style='width:60px;text-align:right;'>"
|
||||
@ -2746,7 +2745,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;text-align:left;'>")
|
||||
sb.append("<td style='width:120px;'>")
|
||||
.append(StringUtils.defaultString(itemResponse.getItemNo()))
|
||||
.append("</td>");
|
||||
sb.append("<td style='width:60px;text-align:right;'>").append(amountStr).append("</td>");
|
||||
|
||||
@ -2503,9 +2503,7 @@ public class PwrGnrSimService {
|
||||
// file Name 명이 없는경우
|
||||
if (estimateRequest.getFileName() == null || "".equals(estimateRequest.getFileName())) {
|
||||
estimateRequest.setFileName(
|
||||
StringUtils.defaultString(estimateResponse.getObjectNo())
|
||||
+ "_"
|
||||
+ StringUtils.defaultString(estimateResponse.getPlanNo())
|
||||
estimateResponse.getObjectNo()
|
||||
+ "_"
|
||||
+ new SimpleDateFormat("yyyyMMdd").format(new Date()));
|
||||
}
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user