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 4658183..63ac46a 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 @@ -139,6 +139,16 @@ public class MjonKakaoATController { resultList = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserList_advc(kakaoVO); int totCnt = mjonKakaoATService.selectMjonKakaoATGroupCompleteByUserListCnt_advc(kakaoVO); + + // 리스트 치환 부분 + resultList.stream().forEach(t->{ + if("A".equals(t.getSendKind())) { + t.setSendKind("API"); + }else { + t.setSendKind("WEB"); + } + }); + model.addAttribute("resultList", resultList); //알림톡발송 실패 결과 코드정보 리스트 불러오기 diff --git a/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java b/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java index 527f146..d26e1e5 100644 --- a/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java +++ b/src/main/java/itn/let/kakao/kakaoComm/KakaoVO.java @@ -259,6 +259,8 @@ public class KakaoVO extends MjonMsgVO{ private String msgResendAllGroupId; private String msgResendAllTmpKey; private String msgResendAllYellowId; + + private String sendKind; private List> varListMap; 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 3c675e5..a2bc46f 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 @@ -2593,7 +2593,8 @@ l.MBER_NM AS userNm, l.AT_SMISHING_YN AS atSmishingYn, l.VIP_YN AS vipYn, - IFNULL(MD.successCount, 0) as successCount + IFNULL(MD.successCount, 0) as successCount, + MMGD.SEND_KIND as sendKind FROM mj_msg_group_data MMGD LEFT JOIN lettngnrlmber l @@ -2677,6 +2678,15 @@ AND MMGD.SMS_TXT LIKE CONCAT ('%', #searchKeyword#,'%') + + + + MMGD.SEND_KIND ='H' + + + MMGD.SEND_KIND ='A' + + ORDER BY CASE WHEN MMGD.AT_DELAY_YN = 'Y' 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 44867b8..e93cdf6 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 @@ -612,16 +612,23 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { - - <%-- --%> + + + + @@ -655,6 +662,7 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { + @@ -668,6 +676,7 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { 예약 내용 타입 + 방식 @@ -778,6 +787,9 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { ', ''); return false;" style="cursor:pointer;" class="smishing"> + ', ''); return false;" style="cursor:pointer;" class="smishing"> + +