From e07445aa28c5cfbb7f5e7f196ca9c3483088927f Mon Sep 17 00:00:00 2001 From: "LAPTOP-L3VE7KK2\\USER" Date: Thu, 16 Jan 2025 17:47:33 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=97=91?= =?UTF-8?q?=EC=85=80/PDF=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C=EB=AA=85?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/estimate/EstimateService.java | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) 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 3d8118a9..1e40090c 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -846,6 +846,7 @@ public class EstimateService { // [7]. 견적서 도면 복사 (추후 개발 필요) // [8]. QSP Q.CAST SEND API + /* List resultList = new ArrayList(); estimateRequest.setObjectNo(estimateCopyRequest.getCopyObjectNo()); estimateRequest.setPlanNo(estimateCopyRequest.getCopyPlanNo()); @@ -860,6 +861,7 @@ public class EstimateService { estimateMapper.updateEstimateApi(estimateRequest); } + */ } catch (Exception e) { throw new QcastException(ErrorCode.INTERNAL_SERVER_ERROR); @@ -1224,12 +1226,6 @@ public class EstimateService { HttpServletRequest request, HttpServletResponse response, EstimateRequest estimateRequest) throws Exception { - // file Name 명이 없는경우 - if (estimateRequest.getFileName() == null || "".equals(estimateRequest.getFileName())) { - estimateRequest.setFileName( - "Quation_Detail_" + new SimpleDateFormat("yyyyMMdd").format(new Date())); - } - EstimateResponse estimateResponse = new EstimateResponse(); String splitStr = "、"; @@ -1237,6 +1233,16 @@ public class EstimateService { // 견적서 상세 조회 estimateResponse = estimateMapper.selectEstimatePdfDetail(estimateRequest); + // file Name 명이 없는경우 + if (estimateRequest.getFileName() == null || "".equals(estimateRequest.getFileName())) { + estimateRequest.setFileName( + estimateResponse.getObjectNo() + + "_" + + estimateResponse.getObjectName() + + "_" + + new SimpleDateFormat("yyyyMMdd").format(new Date())); + } + if ("1".equals(estimateRequest.getSchDisplayFlg())) { estimateResponse.setCustSaleStoreName(estimateResponse.getObjectName()); estimateResponse.setCustOmit(estimateResponse.getObjectNameOmit());