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

feature/jp-0331 #526

Open
jungpyo2001 wants to merge 998 commits from feature/jp-0331 into main
pull from: feature/jp-0331
merge into: qcast3:main
Conversation 0 Commits 998 Files Changed 12805 +5 -2
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fc6655f9dc - Show all commits

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

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