From c7deb3e5c1546e9ee6291d35e5f965f912f8a365 Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Fri, 19 Jan 2024 18:28:31 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=9A=8C?=
 =?UTF-8?q?=EC=9B=90=20=EC=A0=95=EB=B3=B4=20=ED=8C=9D=EC=97=85=20=EC=95=8C?=
 =?UTF-8?q?=EB=A6=BC=ED=86=A1/=EC=B9=9C=EA=B5=AC=ED=86=A1=20=EB=B0=9C?=
 =?UTF-8?q?=EC=86=A1=20=EB=82=B4=EC=97=AD=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=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

---
 .../let/kakao/MjonKakaoATData_SQL_mysql.xml   | 29 ++++++++++---------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
index df0b4253..529d8129 100644
--- a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml
@@ -367,11 +367,11 @@
 			AND     C.RSLT_CODE != '7000'
 			AND     C.MSG_TYPE = '8'
 		)	AS atFailCount ,
-		<!-- ( SELECT COUNT(0) 
+		( SELECT COUNT(0) 
 			FROM    MJ_MSG_DATA C
 			WHERE   C.DEL_FLAG     = 'N'
 			AND     C.RESERVE_C_YN = 'N'
-			AND     C.MSG_GROUP_ID = MG.MSG_GROUP_ID
+			AND     C.MSG_GROUP_ID = M2.msgGroupId
 			AND     C.RSLT_CODE = '7000'
 			AND     C.MSG_TYPE = '9'
 		)	AS ftSuccessCount ,
@@ -379,12 +379,12 @@
 			FROM    MJ_MSG_DATA C
 			WHERE   C.DEL_FLAG     = 'N'
 			AND     C.RESERVE_C_YN = 'N'
-			AND     C.MSG_GROUP_ID = MG.MSG_GROUP_ID
+			AND     C.MSG_GROUP_ID = M2.msgGroupId
 			AND     C.RSLT_CODE != '7000'
 			AND     C.MSG_TYPE = '9'
-		)	AS ftFailCount , -->
-		'0' AS ftSuccessCount,
-		'0' AS ftFailCount,
+		)	AS ftFailCount ,
+		<!-- '0' AS ftSuccessCount,
+		'0' AS ftFailCount, -->
 		M2.bizUmid,
 		M2.callStatus,
 		M2.bizKakaoResendYn,
@@ -525,7 +525,7 @@
 				</isNotEmpty>
 				AND MG.DEL_FLAG ='N'
 				AND MG.RESERVE_C_YN = 'N'
-				AND MG.MSG_TYPE = '8'
+				AND MG.MSG_TYPE IN ('8', '9')
 			)M
 			LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI
 			ON	M.MSG_NOTICETALK_SENDER_KEY = MKPI.SENDER_KEY 
@@ -1142,7 +1142,7 @@
 				AND     C.RSLT_CODE != '7000'
 				AND     C.MSG_TYPE = '8'
 			)	AS atFailCount ,
-			<!-- ( SELECT COUNT(0) 
+			( SELECT COUNT(0) 
 				FROM    MJ_MSG_DATA C
 				WHERE   C.DEL_FLAG     = 'N'
 				AND     C.RESERVE_C_YN = 'N'
@@ -1157,9 +1157,9 @@
 				AND     C.MSG_GROUP_ID = M2.msgGroupId
 				AND     C.RSLT_CODE != '7000'
 				AND     C.MSG_TYPE = '9'
-			)	AS ftFailCount ,-->
-			'0' AS ftSuccessCount,
-			'0' AS ftFailCount,
+			)	AS ftFailCount ,
+			<!-- '0' AS ftSuccessCount,
+			'0' AS ftFailCount, -->
 			M2.bizUmid,
 			M2.callStatus,
 			M2.bizKakaoResendYn,
@@ -1290,7 +1290,7 @@
 				</isNotEmpty>
 					AND MG.DEL_FLAG ='N'
 					AND MG.RESERVE_C_YN = 'N'
-					AND MG.MSG_TYPE = '8'
+					AND MG.MSG_TYPE IN ('8', '9')
 				)M
 				LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI
 				ON	M.MSG_NOTICETALK_SENDER_KEY = MKPI.SENDER_KEY 
@@ -1363,7 +1363,8 @@
 				
 				<isNotEmpty property="pageType">
 					<isEqual property="pageType" compareValue="sand">
-						AND M.AT_DELAY_COMPLETE_YN ='Y'
+					/** 20240119 우영두 수정 - 딜레이 승인된 건들만 조회하고 있어서 AND 조건 에서 OR 조건으로 변경 처리함 */
+						OR M.AT_DELAY_COMPLETE_YN ='Y'
 						/*AND M.REFUND_YN = 'N'*/
 					</isEqual>
 				</isNotEmpty>
@@ -2386,7 +2387,7 @@
 				MJ_MSG_DATA A
 			WHERE 1=1
 				AND A.USER_ID = #userId#
-				AND A.MSG_TYPE IN (8)
+				AND A.MSG_TYPE IN ('8', '9')
 			GROUP BY A.MSG_GROUP_ID
 			)A
 			LEFT JOIN MJ_MSG_GROUP_DATA MGD