From c24552453763312c86fa0d20a964b8e3cad8a86f Mon Sep 17 00:00:00 2001
From: wyh <Administrator@DESKTOP-NTG19QC>
Date: Mon, 10 Jul 2023 17:52:02 +0900
Subject: [PATCH] =?UTF-8?q?=EC=83=81=EC=84=B8=EB=B3=B4=EA=B8=B0=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

---
 .../sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml  | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 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 00b218bf..a6a0e055 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
@@ -745,9 +745,9 @@
 					THEN '단문'
 					ELSE '장문'
 				END BIZ_KAKAO_RESEND_TYPE
-                , A.BIZ_KAKAO_RESEND_DATA
-                , A.BIZ_KAKAO_JSON_FILE
-                , A.BIZ_UMID
+				, A.BIZ_KAKAO_RESEND_DATA
+				, A.BIZ_KAKAO_JSON_FILE
+				, A.BIZ_UMID
 				<include refid="KakaoSentDAO.selectJoinQuery"/>
 				<isNotEmpty property="userId">
 					AND B.USER_ID = #userId#
@@ -767,7 +767,12 @@
 					AND A.MSG_TYPE IN ('8','9')
 			</isEmpty>
 				<![CDATA[ 
-					AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
+					AND CASE 
+						WHEN B.RESERVE_YN = 'N' 
+							THEN (B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)) 
+						WHEN B.RESERVE_YN = 'Y' 
+							THEN (B.REQ_DATE <= NOW() OR (B.AT_DELAY_YN = 'Y' AND B.AT_DELAY_COMPLETE_YN = 'N'))
+					END
 				]]>
 			)M
 			LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI