diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java index 1e84512a..eb74a5d5 100644 --- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java +++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java @@ -81,7 +81,14 @@ public class MjonMsgSentVO extends UserDefaultVO{ private String callFromComma; private String callToComma; - + private String msgSentType; + + public String getMsgSentType() { + return msgSentType; + } + public void setMsgSentType(String msgSentType) { + this.msgSentType = msgSentType; + } public String getCallFromComma() { return callFromComma; } diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml index dc2e2342..344c5a3b 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml @@ -411,8 +411,16 @@ AND DATE_FORMAT(REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d') ]]> + + + AND SUBSTR(SMS_TXT, 1, 8) != '(선거운동정보)' + + + AND SUBSTR(SMS_TXT, 1, 8) = '(선거운동정보)' + + GROUP BY MSG_GROUP_ID - ORDER BY 1=1, MSG_GROUP_ID DESC + ORDER BY 1=1 , curState $searchSortOrd$ diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp index 1a9cedfa..29ce9b75 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp @@ -3181,6 +3181,17 @@ function checkNumber(event) { return true; } +//문자 발송목록 +function getMjMsgSentListAll(pageNo) { + document.sentListForm.pageIndex.value = pageNo; + document.sentListForm.msgSentType.value = "02"; // 01:문자전송, 02:선거문자 + + var sendData= $(document.sentListForm).serializeArray(); + $("#mjMsgSentListAllLoad").load("/web/mjon/msgdata/selectMjMsgSentListAjax.do", sendData ,function(response, status, xhr){ + + }); +} + @@ -3189,6 +3200,48 @@ function checkNumber(event) { + + + + + + + + + + + + + 문자내용 + + + + + + 닫기 + + + + + + + + + + 전송내역 + + + + + + 닫기 + + + + + @@ -4025,6 +4078,11 @@ function checkNumber(event) { 자주 보내는 번호 + <%-- + + 재전송 + + --%> 오류 검사 diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp index edb7ca97..367d5f93 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp @@ -3189,9 +3189,10 @@ function checkNumber(event) { return true; } -//문자 발송목록(msgSentType : 01:문자전송, 02:선거문자) -function getMjMsgSentListAll(pageNo, msgSentType) { +//문자 발송목록 +function getMjMsgSentListAll(pageNo) { document.sentListForm.pageIndex.value = pageNo; + document.sentListForm.msgSentType.value = "01"; // 01:문자전송, 02:선거문자 var sendData= $(document.sentListForm).serializeArray(); $("#mjMsgSentListAllLoad").load("/web/mjon/msgdata/selectMjMsgSentListAjax.do", sendData ,function(response, status, xhr){ @@ -3209,8 +3210,11 @@ function getMjMsgSentListAll(pageNo, msgSentType) { - - + + + + + @@ -3233,10 +3237,10 @@ function getMjMsgSentListAll(pageNo, msgSentType) { - + 전송내역 - + @@ -3246,7 +3250,6 @@ function getMjMsgSentListAll(pageNo, msgSentType) { - @@ -3877,7 +3880,7 @@ function getMjMsgSentListAll(pageNo, msgSentType) { <%-- - 재전송 + 재전송 --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp index fedb83ac..7b2c1867 100644 --- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp @@ -21,31 +21,39 @@ --> -
문자내용
전송내역