From b3405acb81fc2e10725171bd63fe2dfcddfd20b4 Mon Sep 17 00:00:00 2001 From: ysCha Date: Fri, 19 Sep 2025 11:22:15 +0900 Subject: [PATCH] =?UTF-8?q?=EA=B2=AC=EC=A0=81=EC=84=9C=20=EC=B6=9C?= =?UTF-8?q?=EB=A0=A5=EC=8B=9C=20=EC=A3=BC=EC=86=8C,=20=EC=A0=84=ED=99=94,?= =?UTF-8?q?=20=ED=8C=A9=EC=8A=A4=20selectEstimatePdfDetail=20=EC=BF=BC?= =?UTF-8?q?=EB=A6=AC=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/config/application-dev.yml | 4 ++-- src/main/resources/mappers/estimate/estimateMapper.xml | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/resources/config/application-dev.yml b/src/main/resources/config/application-dev.yml index 2cfa39a1..01fadd46 100644 --- a/src/main/resources/config/application-dev.yml +++ b/src/main/resources/config/application-dev.yml @@ -26,10 +26,10 @@ spring: profiles: scheduler: N #QSP url 하나시스운영 #https://jp.qsalesplatform.com -#QSP url 하나시스개발 #https://121.168.9.37:8080 +#QSP url 하나시스개발 #http://121.168.9.37:8080 #QSP url interplug dev #http://1.248.227.176:8120 qsp: - url: http://121.168.9.37:8080 + url: https://jp-dev.qsalesplatform.com master-store-batch-url: /api/master/storeAdditionalInfo master-material-batch-url: /api/master/materialList master-bom-batch-url: /api/master/bomList diff --git a/src/main/resources/mappers/estimate/estimateMapper.xml b/src/main/resources/mappers/estimate/estimateMapper.xml index 1ff28cb9..c83fb112 100644 --- a/src/main/resources/mappers/estimate/estimateMapper.xml +++ b/src/main/resources/mappers/estimate/estimateMapper.xml @@ -94,11 +94,11 @@ SELECT T.* , SS1.SALE_STORE_NAME AS CUST_SALE_STORE_NAME - , CASE WHEN SS2.DISP_COMPANY_NAME IS NOT NULL THEN SS2.DISP_COMPANY_NAME ELSE SS2.SALE_STORE_NAME END AS SALE_STORE_NAME - , CASE WHEN SS2.DISP_ZIP_NO IS NOT NULL THEN SS2.DISP_ZIP_NO ELSE SS2.ZIP_NO END AS ZIP_NO - , CASE WHEN SS2.DISP_ADDRESS IS NOT NULL THEN SS2.DISP_ADDRESS ELSE SS2.ADDRESS END AS ADDRESS - , CASE WHEN SS2.DISP_TEL IS NOT NULL THEN SS2.DISP_TEL ELSE SS2.TEL END AS TEL - , CASE WHEN SS2.DISP_FAX IS NOT NULL THEN SS2.DISP_FAX ELSE SS2.FAX END AS FAX + , COALESCE(NULLIF(SS2.DISP_COMPANY_NAME, ''), SS2.SALE_STORE_NAME) AS SALE_STORE_NAME + , COALESCE(NULLIF(SS2.DISP_ZIP_NO, ''), SS2.ZIP_NO) AS ZIP_NO + , COALESCE(NULLIF(SS2.DISP_ADDRESS, ''), SS2.ADDRESS) AS ADDRESS + , COALESCE(NULLIF(SS2.DISP_TEL, ''), SS2.TEL) AS TEL + , COALESCE(NULLIF(SS2.DISP_FAX, ''), SS2.FAX) AS FAX , SSI2.BIZ_NO FROM (