diff --git a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java index ab4b4de9..f2b13d07 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -963,30 +963,30 @@ public class EstimateService { // 발전시뮬레이션 pdf Html 생성 doc = pwrGnrSimService.pwrGnrSimPdfHtml(doc, pwrGnrSimResponse); - // SchDrawingFlg 1 : 전체 , 2 : 견적서, 3 : 발전시뮬레이션, 4 : 도면 - if ("1".equals(estimateRequest.getSchDrawingFlg())) { + // SchDrawingFlg (1 : 견적서,2 : 발전시뮬레이션, 3 : 도면, 4 : 가대) + // ex) 1|2|3|4 + if (estimateRequest.getSchDrawingFlg().indexOf("1") > -1) { arrSection[iSection] = "div.section1"; iSection++; arrSection[iSection] = "div.section2"; iSection++; + } + + if (estimateRequest.getSchDrawingFlg().indexOf("2") > -1) { arrSection[iSection] = "div.section3"; // 발전시뮬레이션 iSection++; + } + + if (estimateRequest.getSchDrawingFlg().indexOf("3") > -1) { arrSection[iSection] = "div.section4"; // 도면 iSection++; arrSection[iSection] = "div.section5"; // 도면 - } else if ("2".equals(estimateRequest.getSchDrawingFlg())) { - arrSection[iSection] = "div.section1"; iSection++; - arrSection[iSection] = "div.section2"; - } else if ("3".equals(estimateRequest.getSchDrawingFlg())) { - arrSection[iSection] = "div.section3"; // 발전시뮬레이션 - } else if ("4".equals(estimateRequest.getSchDrawingFlg())) { - arrSection[iSection] = "div.section4"; // 도면 + } + + if (estimateRequest.getSchDrawingFlg().indexOf("4") > -1) { + arrSection[iSection] = "div.section6"; iSection++; - arrSection[iSection] = "div.section5"; // 도면 - } else { - throw new QcastException( - ErrorCode.NOT_FOUND, message.getMessage("common.message.no.data")); } // pdf 다운로드