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

feature/jp-0331 #526

Closed
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 +2 -1
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 40831b4672 - Show all commits

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

@ -717,6 +717,7 @@ public class EstimateService {
} }
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace();
throw new QcastException(ErrorCode.INTERNAL_SERVER_ERROR); throw new QcastException(ErrorCode.INTERNAL_SERVER_ERROR);
} }
} }
@ -2223,7 +2224,7 @@ public class EstimateService {
// ArrayList 생성 변환 // ArrayList 생성 변환
ArrayList<String> list = new ArrayList<String>(); ArrayList<String> list = new ArrayList<String>();
for (ItemRequest pcsSerItemReq : circuitList) { for (ItemRequest pcsSerItemReq : circuitList) {
list.add(pcsSerItemReq.getCircuit()); list.add(pcsSerItemReq.getCircuit().replaceAll("\\(", "").replaceAll("\\)", ""));
} }
// ArrayList 회로 중복수 오름차순 정렬 // ArrayList 회로 중복수 오름차순 정렬

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

Binary file not shown.