From ee6d9048f7383b62389bea33dfcfd100df65cf33 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Tue, 11 Jul 2023 11:10:41 +0900
Subject: [PATCH] =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=A0=84=EC=86=A1?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C=20=EB=AA=A9=EB=A1=9D=EC=9D=80=20(=EC=A6=89?=
 =?UTF-8?q?=EC=8B=9C=20+=20=EC=98=88=EC=95=BD=20=EB=B0=9C=EC=86=A1?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C=20+=20=EC=B2=98=EB=A6=AC=EC=95=88=EB=90=9C?=
 =?UTF-8?q?=20=EC=A7=80=EC=97=B0=EB=AC=B8=EC=9E=90(=EC=A6=89=EC=8B=9C,?=
 =?UTF-8?q?=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/msg/MjonMsgData_SQL_mysql.xml          | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
index 6b719939..44b028ad 100644
--- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml
@@ -766,9 +766,20 @@
 				) D ON A.MSG_TYPE = D.CODE			/** 메세지타입 */
 	 		WHERE 1 = 1
 	 		AND A.MSG_TYPE IN (4, 6)
+	 		<!-- 
 	 		AND ((IFNULL(DELAY_YN, 'N') = 'Y' AND DATE_ADD(NOW(), INTERVAL 60 MINUTE) >= REQ_DATE)
 	 		OR (IFNULL(DELAY_YN, 'N') = 'N' AND NOW() >= REQ_DATE)
 			OR (RESERVE_YN = 'Y' AND NOW() >= REQ_DATE))
+			-->
+			<!-- JSPark 2023.07.11 문자 전송완료 목록은 (즉시 + 예약 발송완료 + 처리안된 지연문자(즉시,예약) 노출 -->
+			<![CDATA[
+		    AND CASE 
+		    	WHEN RESERVE_YN = 'N' 
+		      		THEN (REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)) 
+		    	WHEN RESERVE_YN = 'Y' 
+		      		THEN (REQ_DATE <= NOW() OR (IFNULL(DELAY_YN, 'N') = 'Y' AND IFNULL(DELAY_COMPLETE_YN, 'N') = 'N'))					
+		    END								
+			]]>			
 	 		<isNotEmpty property="searchKeyword">
 				<isEqual property="searchCondition" compareValue="" >
 	 		    	AND (