From 881decfe3715e1b0a4db31f0fcf24eff44c63318 Mon Sep 17 00:00:00 2001
From: Jeon <junyaup@ectech.co.kr>
Date: Thu, 20 Jul 2023 13:58:54 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B2=AD=EA=B5=AC=EA=B2=80=EC=A6=9D=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=9B=94=20=EC=82=AC=EC=9A=A9=20=EC=9A=94?=
 =?UTF-8?q?=EA=B8=88=EC=A0=9C=20=ED=8A=B9=EC=A0=95=20=ED=95=98=EB=8A=94=20?=
 =?UTF-8?q?=EC=BF=BC=EB=A6=AC=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mysql/calculate/calculate-mapper.xml      | 27 ++++++++++---------
 1 file changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/mapper/mysql/calculate/calculate-mapper.xml b/src/main/resources/mapper/mysql/calculate/calculate-mapper.xml
index 9c44ad2..5ca190d 100644
--- a/src/main/resources/mapper/mysql/calculate/calculate-mapper.xml
+++ b/src/main/resources/mapper/mysql/calculate/calculate-mapper.xml
@@ -348,7 +348,7 @@
 							ESI.USER_SEQ
 							,ESI.ENTR_NO
 							,ESI.JOIN_DIV
-							,IFNULL(EPR.PROD_CD,ESI.PROD_CD) AS PROD_CD
+							,IFNULL(ESH.PROD_CD,ESI.PROD_CD) AS PROD_CD
 							,ESU.CUST_SEQ
 							,SUM(IF(EUL.LMT_YM = DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m'),EUL.FX_LMT_AMT,0)) AS FX_LMT_AMT
 							,SUM(IF(EUL.LMT_YM = DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m'),EUL.CFWD_AMT,0)) AS CFWD_AMT
@@ -373,18 +373,19 @@
 						LEFT JOIN hubez_admin.EZ_USER_LMT EUL 
 						ON ESI.USER_SEQ = EUL.USER_SEQ AND EUL.LMT_YM BETWEEN DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m') AND DATE_FORMAT(DATE_ADD(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),INTERVAL +1 MONTH),'%Y%m')
 						INNER JOIN hubez_common.EZ_SVC_USER ESU ON ESI.USER_SEQ = ESU.USER_SEQ
-						LEFT JOIN (SELECT
-										SUBS_ID,PROD_CD
-									FROM hubez_common.EZ_PRDCHG_RSRV
-									WHERE (SUBS_ID,EFCT_ST_DT) IN (
-										SELECT
-											SUBS_ID, MAX(EFCT_ST_DT)
-										FROM hubez_common.EZ_PRDCHG_RSRV
-										WHERE TRT_STTUS_CD = '02'
-											AND DATE_FORMAT(EFCT_ST_DT,'%Y%m') <![CDATA[ <= ]]> DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m')
-										GROUP BY SUBS_ID
-									)
-						) EPR ON ESI.SUBS_ID = EPR.SUBS_ID
+						LEFT JOIN (
+							SELECT
+								SUBS_ID,PROD_CD
+							FROM hubez_common.EZ_SBSCST_HST
+							WHERE (SUBS_ID,EFCT_ST_DT) IN (
+								SELECT
+									SUBS_ID, MAX(EFCT_ST_DT)
+								FROM hubez_common.EZ_SBSCST_HST
+								WHERE DATE_FORMAT(EFCT_ST_DT,'%Y%m') <![CDATA[ <= ]]> DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m')
+									AND DATE_FORMAT(EFCT_FNS_DT,'%Y%m') <![CDATA[ > ]]> DATE_FORMAT(CONCAT(STR_TO_DATE(#{lmtYm},'%Y%m'),'01'),'%Y%m')
+								GROUP BY SUBS_ID
+							)
+						) ESH ON ESI.SUBS_ID = ESH.SUBS_ID
 						, (
 							SELECT
 								SUM(IF(ESC.SND_CH_CD = 'ALIMTALK',UCOST,0)) AS KKO_NOTI_COST