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 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) ]]> - + + + + + AND ( + (MMGD.RESERVE_YN = 'Y') + AND + (MMGD.AT_DELAY_YN = 'N' or (MMGD.AT_DELAY_YN = 'Y' AND MMGD.AT_DELAY_COMPLETE_YN = 'Y')) + ) + AND IFNULL(MMGD.RESERVE_YN, 'N') = 'N' @@ -2666,7 +2671,11 @@ AND MMGD.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%') - 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 , curState $searchSortOrd$ @@ -2708,19 +2717,24 @@ AND MMGD.REQ_DATE < DATE_ADD(#ntceEndde#, INTERVAL 1 DAY) ]]> - + + + + + AND ( + (MMGD.RESERVE_YN = 'Y') + AND + (MMGD.AT_DELAY_YN = 'N' or (MMGD.AT_DELAY_YN = 'Y' AND MMGD.AT_DELAY_COMPLETE_YN = 'Y')) + ) + AND IFNULL(MMGD.RESERVE_YN, 'N') = 'N' 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) {
- + - +