From 8b870ea494c1c2f4ef910195316a1aaebbb98fbb Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Mon, 10 Jul 2023 15:26:04 +0900
Subject: [PATCH] =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1=EC=99=84=EB=A3=8C=20=EB=AA=A9=EB=A1=9D=EC=9D=80=20(?=
 =?UTF-8?q?=EC=A6=89=EC=8B=9C=20+=20=EC=98=88=EC=95=BD=20=EB=B0=9C?=
 =?UTF-8?q?=EC=86=A1=EC=99=84=EB=A3=8C=20+=20=EC=B2=98=EB=A6=AC=EC=95=88?=
 =?UTF-8?q?=EB=90=9C=20=EC=A7=80=EC=97=B0=EB=AC=B8=EC=9E=90(=EC=A6=89?=
 =?UTF-8?q?=EC=8B=9C,=EC=98=88=EC=95=BD)=20=EB=85=B8=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml       | 9 +++++++--
 1 file changed, 7 insertions(+), 2 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 2deba729..00b218bf 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
@@ -517,9 +517,14 @@
 				AND MD.MSG_GROUP_ID = MG.MSG_GROUP_ID
 				AND IFNULL(MG.DEL_FLAG, 'N') = 'N'
 				AND MD.DEL_FLAG = 'N'
-				<!-- JSPark 2023.03.24 알림톡 전송완료 목록은 (즉시 + 예약 발송완료) 노출 -->
+				<!-- JSPark 2023.07.10 알림톡 전송완료 목록은 (즉시 + 예약 발송완료 + 처리안된 지연문자(즉시,예약) 노출 -->
 				<![CDATA[
-				AND MG.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE) 
+			    AND CASE 
+			    	WHEN MG.RESERVE_YN = 'N' 
+			      		THEN (MG.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)) 
+			    	WHEN MG.RESERVE_YN = 'Y' 
+			      		THEN (MG.REQ_DATE <= NOW() OR (MG.AT_DELAY_YN = 'Y' AND MG.AT_DELAY_COMPLETE_YN = 'N'))					
+			    END								
 				]]>
 				<isNotEmpty property="userId">
 				AND MG.USER_ID = #userId#