From eb7d80c329e392ed2fd28940e88bbe255f0783f0 Mon Sep 17 00:00:00 2001 From: Jeon Date: Thu, 6 Jul 2023 14:44:25 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=BC=ED=95=A0=20=EA=B3=84=EC=82=B0=20?= =?UTF-8?q?=EC=A0=95=EC=A7=80=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B4=80?= =?UTF-8?q?=EB=A0=A8=20=EC=88=98=EC=A0=95=20=ED=95=B4=EC=A7=80=20=EA=B3=A0?= =?UTF-8?q?=EA=B0=9D=20=EC=A0=95=EC=95=A1=20=EC=9A=94=EA=B8=88=20=EA=B3=84?= =?UTF-8?q?=EC=82=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/calculate/views/Verification.vue | 6 +----- .../mapper/mysql/calculate/calculate-mapper.xml | 12 ++++++++++-- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/frontend/src/modules/calculate/views/Verification.vue b/frontend/src/modules/calculate/views/Verification.vue index f325e0f..e96a389 100644 --- a/frontend/src/modules/calculate/views/Verification.vue +++ b/frontend/src/modules/calculate/views/Verification.vue @@ -183,11 +183,7 @@ export default { vuejsDatepicker }, computed : {}, - watch: { - discount : function(){ - console.log("dddd"); - } - }, + watch: {}, created() { this.getExcelHeader(); }, diff --git a/src/main/resources/mapper/mysql/calculate/calculate-mapper.xml b/src/main/resources/mapper/mysql/calculate/calculate-mapper.xml index a2afe0b..73f581c 100644 --- a/src/main/resources/mapper/mysql/calculate/calculate-mapper.xml +++ b/src/main/resources/mapper/mysql/calculate/calculate-mapper.xml @@ -195,7 +195,7 @@ ,FORMAT(A.CFWD_CHRG_BLNC,1) AS CFWD_CHRG_BLNC ,A.NOW_CFWD_AMT ,(CASE - WHEN A.SUBS_STTUS_CD = '99' + WHEN A.SUBS_STTUS_CD = '99' AND A.CS_YN = 1 THEN 0 ELSE (IF(A.SUBS_STTUS_CD IN ('03','04') AND A.USE_DAY IS NULL,0,(ROUND((A.FX_LMT_AMT/LAST_DT)*IFNULL(A.USE_DAY,LAST_DT)))) + A.CFWD_AMT - A.EXTNC_AMT - A.TOTAL_USE_AMT @@ -294,6 +294,7 @@ ,A.MMS_COST ,IF(USETB.USE_DAY 0,NULL,USETB.USE_DAY) AS USE_DAY ,DATE_FORMAT(LAST_DAY(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01')),'%d') AS LAST_DT + ,USETB.CS_YN FROM ( SELECT LMT.USER_SEQ @@ -457,9 +458,10 @@ LEFT JOIN ( SELECT A.USER_SEQ + ,MAX(CS_YN) AS CS_YN ,SUM(CASE WHEN A.STTUS_PLAG = 'S' THEN A.EFCT_FNS_DT - A.EFCT_ST_DT + 1 - WHEN A.STTUS_PLAG = 'P' THEN -1 + WHEN A.STTUS_PLAG = 'P' THEN A.P_DAY WHEN A.STTUS_PLAG = 'E' THEN 0 END) AS USE_DAY FROM ( @@ -467,8 +469,14 @@ ESI.CUST_SEQ ,ESI.USER_SEQ ,ESI.SUBS_ID + ,IF(DATE_FORMAT(ESH.EFCT_ST_DT,'%Y%m') = DATE_FORMAT(CONCAT(STR_TO_DATE('202306','%Y%m'),'01'),'%Y%m') AND ESH.SUBS_STTUS_CD IN ('03','04'),-1,0) AS P_DAY ,IF(DATE_FORMAT(ESH.EFCT_ST_DT,'%Y%m') != DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m'),'01',DATE_FORMAT(ESH.EFCT_ST_DT,'%d')) AS EFCT_ST_DT ,IF(ESH.EFCT_FNS_DT ]]> LAST_DAY(DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m01')) ,DATE_FORMAT(LAST_DAY(DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m01')),'%d'),DATE_FORMAT(ESH.EFCT_FNS_DT,'%d')) AS EFCT_FNS_DT + ,(CASE + WHEN ESH.SUBS_STTUS_CD = '99' + THEN IF(DATE_FORMAT(ESH.EFCT_ST_DT,'%Y%m') ]]> DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m'),0,1) + ELSE 0 + END) AS CS_YN ,(CASE WHEN ESH.SUBS_STTUS_CD IN ('02') THEN 'S' WHEN ESH.SUBS_STTUS_CD IN ('03','04') THEN 'P' ELSE 'E' END) AS STTUS_PLAG ,DATE_FORMAT(LAST_DAY(DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m01')),'%d') AS LAST_DT FROM hubez_common.EZ_SUBS_INFO ESI, hubez_common.EZ_SBSCST_HST ESH