From 1c0c5b25747967dc4603b421b3757c9a482e0919 Mon Sep 17 00:00:00 2001
From: JIWOO <dlwldn1024@iten.co.kr>
Date: Thu, 26 Jun 2025 15:29:13 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=95=8C?=
 =?UTF-8?q?=EB=A6=BC=ED=86=A1=20=EC=A0=84=EC=86=A1=EB=A6=AC=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=88=98=EC=A0=95,=20=EC=95=8C=EB=A6=BC=ED=86=A1?=
 =?UTF-8?q?=20=EC=98=88=EC=95=BD=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../kakaoAt/web/MjonKakaoATController.java    |  4 ++
 .../let/kakao/MjonKakaoATData_SQL_mysql.xml   | 68 +++++++++++--------
 .../jsp/uss/ion/kakaoat/SendKakaoATList.jsp   |  4 +-
 3 files changed, 47 insertions(+), 29 deletions(-)

diff --git a/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java b/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java
index 27f0e20..4658183 100644
--- a/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java
+++ b/src/main/java/itn/let/kakao/admin/kakaoAt/web/MjonKakaoATController.java
@@ -134,6 +134,8 @@ public class MjonKakaoATController {
 	    	}					
 				
 //			resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList(kakaoVO);
+			/* 전송리스트, 예약리스트 구분 값 */
+	    	kakaoVO.setPageType("send");
 			resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList_advc(kakaoVO);
 			int totCnt = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserListCnt_advc(kakaoVO);
 			
@@ -332,6 +334,8 @@ public class MjonKakaoATController {
 	    		searchVO.setNtceBgnde(beforeMonthDay);
 	    	}
 	    	
+	    	/* 전송리스트, 	``	 구분 값 */
+	    	searchVO.setPageType("reserve");
 	        List<KakaoVO> resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList_advc(searchVO);
 			int totCnt = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserListCnt_advc(searchVO);
 
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 5629c3d..f6a6706 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
@@ -2629,19 +2629,24 @@
 				AND MMGD.REQ_DATE < DATE_ADD(#ntceEndde#, INTERVAL 1 DAY)
 			]]>
 			</isNotEmpty>
-			<![CDATA[
-			AND (
-					(MMGD.RESERVE_YN = 'N'
-						and MMGD.REQ_DATE <= DATE_ADD(NOW(), interval 60 minute))
-					or
-					(MMGD.RESERVE_YN = 'Y'
-						and (
-							MMGD.REQ_DATE <= NOW()
-								or (MMGD.AT_DELAY_YN = 'Y'
-								and MMGD.AT_DELAY_COMPLETE_YN = 'N')
-					))
-				)
-			]]>
+			<isEqual property="pageType" compareValue="send">
+				<![CDATA[
+				AND (
+						(MMGD.RESERVE_YN = 'N')
+						OR
+						(MMGD.RESERVE_YN = 'Y' and MMGD.REQ_DATE <= NOW())
+						OR
+						(MMGD.RESERVE_YN = 'Y' and MMGD.AT_DELAY_YN = 'Y' AND MMGD.AT_DELAY_COMPLETE_YN = 'N')
+					)
+				]]>
+				</isEqual>
+				<isEqual property="pageType" compareValue="reserve">
+				AND (
+						(MMGD.RESERVE_YN = 'Y')
+						AND
+						(MMGD.AT_DELAY_YN = 'N' or (MMGD.AT_DELAY_YN = 'Y' AND MMGD.AT_DELAY_COMPLETE_YN = 'Y'))
+					)
+			</isEqual>
 			<isEqual property="searchCondition2" compareValue="N">
 				AND IFNULL(MMGD.RESERVE_YN, 'N') = 'N'
 			</isEqual>
@@ -2666,7 +2671,11 @@
 					AND MMGD.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%')
 				</isEqual>
 			</isNotEmpty>
-		ORDER BY 1=1
+		ORDER BY
+			CASE
+				WHEN MMGD.AT_DELAY_YN = 'Y' and MMGD.AT_DELAY_COMPLETE_YN = 'N' THEN 0
+				ELSE 1
+			END
 			<isNotEmpty property="searchSortCnd">
 				<isEqual property="searchSortCnd" compareValue="curState">
 					, curState  $searchSortOrd$
@@ -2708,19 +2717,24 @@
 				AND MMGD.REQ_DATE < DATE_ADD(#ntceEndde#, INTERVAL 1 DAY)
 			]]>
 			</isNotEmpty>
-			<![CDATA[
-			AND (
-					(MMGD.RESERVE_YN = 'N'
-						and MMGD.REQ_DATE <= DATE_ADD(NOW(), interval 60 minute))
-					or
-					(MMGD.RESERVE_YN = 'Y'
-						and (
-							MMGD.REQ_DATE <= NOW()
-								or (MMGD.AT_DELAY_YN = 'Y'
-								and MMGD.AT_DELAY_COMPLETE_YN = 'N')
-					))
-				)
-			]]>
+			<isEqual property="pageType" compareValue="send">
+				<![CDATA[
+				AND (
+						(MMGD.RESERVE_YN = 'N')
+						OR
+						(MMGD.RESERVE_YN = 'Y' and MMGD.REQ_DATE <= NOW())
+						OR
+						(MMGD.RESERVE_YN = 'Y' and MMGD.AT_DELAY_YN = 'Y' AND MMGD.AT_DELAY_COMPLETE_YN = 'N')
+					)
+				]]>
+				</isEqual>
+				<isEqual property="pageType" compareValue="reserve">
+				AND (
+						(MMGD.RESERVE_YN = 'Y')
+						AND
+						(MMGD.AT_DELAY_YN = 'N' or (MMGD.AT_DELAY_YN = 'Y' AND MMGD.AT_DELAY_COMPLETE_YN = 'Y'))
+					)
+			</isEqual>
 			<isEqual property="searchCondition2" compareValue="N">
 				AND IFNULL(MMGD.RESERVE_YN, 'N') = 'N'
 			</isEqual>
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp
index 94a4c2e..acd5e9d 100644
--- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp
@@ -733,9 +733,9 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) {
 
 												<c:if test="${result.reserveCYn eq 'N' && result.atDelayYn eq 'Y' && result.atDelayCompleteYn eq 'N'}">
 													<br />
-													<fmt:formatDate value="${now}" pattern="yyyyMMddhhmm" var="nowDate" />
+													<fmt:formatDate value="${now}" pattern="yyyyMMddHHmm" var="nowDate" />
 													<fmt:parseDate value="${result.reqDate}" pattern="yyyy-MM-dd HH:mm" var="checkValue" />
-													<fmt:formatDate value="${checkValue}" pattern="yyyyMMddhhmm" var="checkDate"/>
+													<fmt:formatDate value="${checkValue}" pattern="yyyyMMddHHmm" var="checkDate"/>
 													<c:if test="${nowDate < checkDate}">
 														<button type="button" class="fillBlue" onclick="kakaoATDelaySend('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.userId}"/>'); return false;">발송승인</button>
 														<button type="button" class="fillRed" onclick="kakaoATDelayCancel('<c:out value="${result.msgGroupId}"/>','<c:out value="${result.userId}"/>'); return false;">발송취소</button>