Commit @ee6d9048f7383b62389bea33dfcfd100df65cf33

itn 2023-07-11

문자 전송완료 목록은 (즉시 + 예약 발송완료 + 처리안된 지연문자(즉시,예약) 노출

@ee6d9048f7383b62389bea33dfcfd100df65cf33

64bd20f

ee6d904

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml


 				) 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 ( 

Add a comment

Open 0
Closed 0

List

...	...	@@ -766,9 +766,20 @@
766	766	) D ON A.MSG_TYPE = D.CODE /** 메세지타입 */
767	767	WHERE 1 = 1
768	768	AND A.MSG_TYPE IN (4, 6)
	769	+ <!--
769	770	AND ((IFNULL(DELAY_YN, 'N') = 'Y' AND DATE_ADD(NOW(), INTERVAL 60 MINUTE) >= REQ_DATE)
770	771	OR (IFNULL(DELAY_YN, 'N') = 'N' AND NOW() >= REQ_DATE)
771	772	OR (RESERVE_YN = 'Y' AND NOW() >= REQ_DATE))
	773	+ -->
	774	+ <!-- JSPark 2023.07.11 문자 전송완료 목록은 (즉시 + 예약 발송완료 + 처리안된 지연문자(즉시,예약) 노출 -->
	775	+ <![CDATA[
	776	+ AND CASE
	777	+ WHEN RESERVE_YN = 'N'
	778	+ THEN (REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE))
	779	+ WHEN RESERVE_YN = 'Y'
	780	+ THEN (REQ_DATE <= NOW() OR (IFNULL(DELAY_YN, 'N') = 'Y' AND IFNULL(DELAY_COMPLETE_YN, 'N') = 'N'))
	781	+ END
	782	+ ]]>
772	783	<isNotEmpty property="searchKeyword">
773	784	<isEqual property="searchCondition" compareValue="" >
774	785	AND (

Delete comment