From d065866a386ae46ea85405ce0c2e34c9d1df33f8 Mon Sep 17 00:00:00 2001 From: "hyojun.choi" Date: Fri, 25 Jul 2025 13:25:34 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=86=8C=EC=88=98=EC=A0=90=20=ED=97=88?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/canvasSetting/dto/CanvasSettingInfo.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java b/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java index 1ccfd594..a578af9b 100644 --- a/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java +++ b/src/main/java/com/interplug/qcast/biz/canvasSetting/dto/CanvasSettingInfo.java @@ -34,9 +34,9 @@ public class CanvasSettingInfo { private boolean dotGridDisplay; private boolean lineGridDisplay; private Integer gridType; - private Integer gridHorizon; - private Integer gridVertical; - private Integer gridRatio; + private float gridHorizon; + private float gridVertical; + private float gridRatio; private String gridDimen; private String gridColor; private String wordFont; From a4ef9006705161685176feff4b4f27819e5c6e2d Mon Sep 17 00:00:00 2001 From: ysCha Date: Mon, 28 Jul 2025 17:15:55 +0900 Subject: [PATCH 2/2] =?UTF-8?q?[1191]=20T01=EC=97=90=20=ED=95=9C=EC=A0=95?= =?UTF-8?q?=20=EC=97=91=EC=85=80=EC=97=90=20=EC=98=81=EC=97=85=EC=A0=90=20?= =?UTF-8?q?=EC=A3=BC=EC=86=8C,=20=EC=A0=84=ED=99=94=EB=B2=88=ED=98=B8,=20f?= =?UTF-8?q?ax?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../qcast/biz/estimate/EstimateService.java | 54 +++++++++++++++++++ .../biz/estimate/dto/EstimateResponse.java | 9 ++++ 2 files changed, 63 insertions(+) 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 b9ea5621..98b84969 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/EstimateService.java @@ -1545,6 +1545,60 @@ public class EstimateService { // estimateResponse.setDrawingImg2(drawingImg2); // } + //userId 에 따른 영업점 주소, 전화, fax 정보 조회 + if(estimateRequest.getSaleStoreId() != null && "T01".equals(estimateRequest.getSaleStoreId())){ + + String strResponse = interfaceQsp.callApi(HttpMethod.GET, + QSP_API_URL + "/api/admin/userDetail?loginId="+estimateRequest.getUserId(), null); + + if (!"".equals(strResponse)) { + com.fasterxml.jackson.databind.ObjectMapper om = + new com.fasterxml.jackson.databind.ObjectMapper() + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false); + EstimateApiResponse estimateApiResponse = om.readValue(strResponse, EstimateApiResponse.class); + + // API 응답 데이터 존재 여부 확인 및 안전한 데이터 추출 + if (estimateApiResponse != null && estimateApiResponse.getData() != null) { + try { + // API 응답 데이터를 Map으로 변환하여 필요한 정보 추출 + @SuppressWarnings("unchecked") + Map userData = (Map) estimateApiResponse.getData(); + + if (!userData.isEmpty()) { + //영업점 주소 확인 및 설정 + Object salesOfficeAddr = userData.get("salesOfficeAddr"); + if (salesOfficeAddr != null && + !StringUtils.isEmpty(salesOfficeAddr.toString().trim())) { + estimateResponse.setZipNo(""); + estimateResponse.setAddress(salesOfficeAddr.toString().replaceAll("\n", "
")); + } + + //영업점 전화 확인 및 설정 + Object salesOfficeTel = userData.get("salesOfficeTel"); + if (salesOfficeTel != null && + !StringUtils.isEmpty(salesOfficeTel.toString().trim())) { + estimateResponse.setTel(salesOfficeTel.toString()); + } + + //영업점 팩스 확인 및 설정 + Object salesOfficeFax = userData.get("salesOfficeFax"); + if (salesOfficeFax != null && + !StringUtils.isEmpty(salesOfficeFax.toString().trim())) { + estimateResponse.setFax(salesOfficeFax.toString()); + } + } + } catch (ClassCastException e) { + log.warn("API 응답 데이터 형변환 실패: {}", e.getMessage()); + } + } + + } else { + + log.warn("common.message.required.data", "User Detail"); + } + } + + if ("PDF".equals(estimateRequest.getSchDownload())) { // PDF 다운로드 String[] arrSection = new String[6]; int iSection = 0; diff --git a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java index 6db31089..00c98510 100644 --- a/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java +++ b/src/main/java/com/interplug/qcast/biz/estimate/dto/EstimateResponse.java @@ -299,4 +299,13 @@ public class EstimateResponse { @Schema(description = "PCS 목록 3개") List pcsList3; + @Schema(description = "영업점 주소") + private String salesOfficeAddr; + + @Schema(description = "영업점 전화번호") + private String salesOfficeTel; + + @Schema(description = "영업점 Fax번호") + private String salesOfficeFax; + }