문자 재전송 기능 작업중
@7c205e4922818dd995ae1215de486fdabec7018b
--- src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
+++ src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
... | ... | @@ -81,7 +81,14 @@ |
| 81 | 81 |
|
| 82 | 82 |
private String callFromComma; |
| 83 | 83 |
private String callToComma; |
| 84 |
- |
|
| 84 |
+ private String msgSentType; |
|
| 85 |
+ |
|
| 86 |
+ public String getMsgSentType() {
|
|
| 87 |
+ return msgSentType; |
|
| 88 |
+ } |
|
| 89 |
+ public void setMsgSentType(String msgSentType) {
|
|
| 90 |
+ this.msgSentType = msgSentType; |
|
| 91 |
+ } |
|
| 85 | 92 |
public String getCallFromComma() {
|
| 86 | 93 |
return callFromComma; |
| 87 | 94 |
} |
--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
... | ... | @@ -411,8 +411,16 @@ |
| 411 | 411 |
AND DATE_FORMAT(REGDATE, '%Y-%m-%d') <= DATE_FORMAT(#endDate#, '%Y-%m-%d') |
| 412 | 412 |
]]> |
| 413 | 413 |
</isNotEmpty> |
| 414 |
+ <isNotEmpty property="msgSentType"> |
|
| 415 |
+ <isEqual property="msgSentType" compareValue="01" > |
|
| 416 |
+ AND SUBSTR(SMS_TXT, 1, 8) != '(선거운동정보)' |
|
| 417 |
+ </isEqual> |
|
| 418 |
+ <isEqual property="msgSentType" compareValue="02" > |
|
| 419 |
+ AND SUBSTR(SMS_TXT, 1, 8) = '(선거운동정보)' |
|
| 420 |
+ </isEqual> |
|
| 421 |
+ </isNotEmpty> |
|
| 414 | 422 |
GROUP BY MSG_GROUP_ID |
| 415 |
- ORDER BY 1=1, MSG_GROUP_ID DESC |
|
| 423 |
+ ORDER BY 1=1 |
|
| 416 | 424 |
<isNotEmpty property="searchSortCnd"> |
| 417 | 425 |
<isEqual property="searchSortCnd" compareValue="curState"> |
| 418 | 426 |
, curState $searchSortOrd$ |
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
... | ... | @@ -3181,6 +3181,17 @@ |
| 3181 | 3181 |
return true; |
| 3182 | 3182 |
} |
| 3183 | 3183 |
|
| 3184 |
+//문자 발송목록 |
|
| 3185 |
+function getMjMsgSentListAll(pageNo) {
|
|
| 3186 |
+ document.sentListForm.pageIndex.value = pageNo; |
|
| 3187 |
+ document.sentListForm.msgSentType.value = "02"; // 01:문자전송, 02:선거문자 |
|
| 3188 |
+ |
|
| 3189 |
+ var sendData= $(document.sentListForm).serializeArray(); |
|
| 3190 |
+ $("#mjMsgSentListAllLoad").load("/web/mjon/msgdata/selectMjMsgSentListAjax.do", sendData ,function(response, status, xhr){
|
|
| 3191 |
+ |
|
| 3192 |
+ }); |
|
| 3193 |
+} |
|
| 3194 |
+ |
|
| 3184 | 3195 |
</script> |
| 3185 | 3196 |
<div class="loading_layer"> |
| 3186 | 3197 |
<div class="loading_container"> |
... | ... | @@ -3189,6 +3200,48 @@ |
| 3189 | 3200 |
</div> |
| 3190 | 3201 |
</div> |
| 3191 | 3202 |
|
| 3203 |
+ <form id="sentListForm" name="sentListForm" method="post"> |
|
| 3204 |
+ <input type="hidden" name="pageType" value=""/> |
|
| 3205 |
+ <input type="hidden" name="pageIndex" value=""/> |
|
| 3206 |
+ <input type="hidden" name="msgSentType" value=""/> |
|
| 3207 |
+ <input type="hidden" name="searchSortCnd" value="" /> |
|
| 3208 |
+ <input type="hidden" name="searchSortOrd" value="" /> |
|
| 3209 |
+ </form> |
|
| 3210 |
+ |
|
| 3211 |
+ <!-- 2023 10 16 재전송 : 상세내용 팝업 --> |
|
| 3212 |
+ <div class="tooltip-wrap" style="z-index:110;"> |
|
| 3213 |
+ <div class="popup-com adr_layer rev_popup01" tabindex="0" data-tooltip-con="rev_popup01" |
|
| 3214 |
+ data-focus="rev_popup01" data-focus-prev="rev_popup01-close" style="width: 440px;"> |
|
| 3215 |
+ <div class="popup_heading"> |
|
| 3216 |
+ <p>문자내용</p> |
|
| 3217 |
+ <button type="button" class="tooltip-close" data-focus="rev_popup01-close"><img |
|
| 3218 |
+ src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
|
| 3219 |
+ </div> |
|
| 3220 |
+ <div class="layer_in" id="msgSentDetailPopLoad" style="padding-bottom: 0px;"> |
|
| 3221 |
+ </div> |
|
| 3222 |
+ <div class="popup_btn_wrap2" style="justify-content: center; margin-bottom: 30px;"> |
|
| 3223 |
+ <button type="button" class="tooltip-close" data-focus="rev_popup01-close" data-focus-next="rev_popup01">닫기</button> |
|
| 3224 |
+ </div> |
|
| 3225 |
+ </div> |
|
| 3226 |
+ </div> |
|
| 3227 |
+ <!--// 2023 10 16 재전송 : 상세내용 팝업 --> |
|
| 3228 |
+ |
|
| 3229 |
+ <!-- 2023 10 16 재전송 팝업 --> |
|
| 3230 |
+ <div class="tooltip-wrap"> |
|
| 3231 |
+ <div class="popup-com import_layer popup05" tabindex="0" data-tooltip-con="popup05" data-focus="popup05" data-focus-prev="popup05-close" style="width: 900px;"> |
|
| 3232 |
+ <div class="popup_heading"> |
|
| 3233 |
+ <p><span>전송내역</p> |
|
| 3234 |
+ <button type="button" class="tooltip-close" data-focus="popup05-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
|
| 3235 |
+ </div> |
|
| 3236 |
+ <div class="layer_in" id="mjMsgSentListAllLoad" style="padding-bottom: 0px; min-height:428px;"> |
|
| 3237 |
+ </div> |
|
| 3238 |
+ <div class="popup_btn_wrap2" style="margin-bottom: 30px;"> |
|
| 3239 |
+ <button type="button" class="tooltip-close" data-focus="popup05-close" data-focus-next="popup05">닫기</button> |
|
| 3240 |
+ </div> |
|
| 3241 |
+ </div> |
|
| 3242 |
+ </div> |
|
| 3243 |
+ <!--// 2023 10 16 재전송 팝업 --> |
|
| 3244 |
+ |
|
| 3192 | 3245 |
<!-- 후보자등록 팝업 data-tooltip:candidate_popup01 --> |
| 3193 | 3246 |
<div class="tooltip-wrap"> |
| 3194 | 3247 |
<div class="popup-com candidate_layer candidate_popup01" tabindex="0" data-tooltip-con="candidate_popup01" data-focus="candidate_popup01" data-focus-prev="candidate_popup01-close" style="width: 620px;"> |
... | ... | @@ -4025,6 +4078,11 @@ |
| 4025 | 4078 |
<div class="btn_popup_wrap"> |
| 4026 | 4079 |
<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button> |
| 4027 | 4080 |
</div> |
| 4081 |
+ <%-- |
|
| 4082 |
+ <div class="btn_popup_wrap"> |
|
| 4083 |
+ <button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
|
|
| 4084 |
+ </div> |
|
| 4085 |
+ --%> |
|
| 4028 | 4086 |
<div class="btn_popup_wrap check_validity_wrap"> |
| 4029 | 4087 |
<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button> |
| 4030 | 4088 |
<div class="error_hover_cont send_hover_cont"> |
--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
... | ... | @@ -3189,9 +3189,10 @@ |
| 3189 | 3189 |
return true; |
| 3190 | 3190 |
} |
| 3191 | 3191 |
|
| 3192 |
-//문자 발송목록(msgSentType : 01:문자전송, 02:선거문자) |
|
| 3193 |
-function getMjMsgSentListAll(pageNo, msgSentType) {
|
|
| 3192 |
+//문자 발송목록 |
|
| 3193 |
+function getMjMsgSentListAll(pageNo) {
|
|
| 3194 | 3194 |
document.sentListForm.pageIndex.value = pageNo; |
| 3195 |
+ document.sentListForm.msgSentType.value = "01"; // 01:문자전송, 02:선거문자 |
|
| 3195 | 3196 |
|
| 3196 | 3197 |
var sendData= $(document.sentListForm).serializeArray(); |
| 3197 | 3198 |
$("#mjMsgSentListAllLoad").load("/web/mjon/msgdata/selectMjMsgSentListAjax.do", sendData ,function(response, status, xhr){
|
... | ... | @@ -3209,8 +3210,11 @@ |
| 3209 | 3210 |
</div> |
| 3210 | 3211 |
|
| 3211 | 3212 |
<form id="sentListForm" name="sentListForm" method="post"> |
| 3212 |
- <input type="hidden" id="pageType" name="pageType" value=""/> |
|
| 3213 |
- <input type="hidden" id="pageIndex" name="pageIndex" value=""/> |
|
| 3213 |
+ <input type="hidden" name="pageType" value=""/> |
|
| 3214 |
+ <input type="hidden" name="pageIndex" value=""/> |
|
| 3215 |
+ <input type="hidden" name="msgSentType" value=""/> |
|
| 3216 |
+ <input type="hidden" name="searchSortCnd" value="" /> |
|
| 3217 |
+ <input type="hidden" name="searchSortOrd" value="" /> |
|
| 3214 | 3218 |
</form> |
| 3215 | 3219 |
|
| 3216 | 3220 |
<!-- 2023 10 16 재전송 : 상세내용 팝업 --> |
... | ... | @@ -3233,10 +3237,10 @@ |
| 3233 | 3237 |
|
| 3234 | 3238 |
<!-- 2023 10 16 재전송 팝업 --> |
| 3235 | 3239 |
<div class="tooltip-wrap"> |
| 3236 |
- <div class="popup-com import_layer popup05" tabindex="0" data-tooltip-con="popup05" data-focus="popup05" data-focus-prev="popup05-close"> |
|
| 3240 |
+ <div class="popup-com import_layer popup05" tabindex="0" data-tooltip-con="popup05" data-focus="popup05" data-focus-prev="popup05-close" style="width: 900px;"> |
|
| 3237 | 3241 |
<div class="popup_heading"> |
| 3238 | 3242 |
<p><span>전송내역</p> |
| 3239 |
- <button type="button" class="tooltip-close" data-focus="popup05-close" id="btnLatestAddPhoneClose"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
|
| 3243 |
+ <button type="button" class="tooltip-close" data-focus="popup05-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
|
| 3240 | 3244 |
</div> |
| 3241 | 3245 |
<div class="layer_in" id="mjMsgSentListAllLoad" style="padding-bottom: 0px; min-height:428px;"> |
| 3242 | 3246 |
</div> |
... | ... | @@ -3246,7 +3250,6 @@ |
| 3246 | 3250 |
</div> |
| 3247 | 3251 |
</div> |
| 3248 | 3252 |
<!--// 2023 10 16 재전송 팝업 --> |
| 3249 |
- |
|
| 3250 | 3253 |
|
| 3251 | 3254 |
<div class="tooltip-wrap"> |
| 3252 | 3255 |
<div class="popup-com history_layer popup03" tabindex="0" data-tooltip-con="popup03" data-focus="popup03" data-focus-prev="popup03-close"> |
... | ... | @@ -3877,7 +3880,7 @@ |
| 3877 | 3880 |
</div> |
| 3878 | 3881 |
<%-- |
| 3879 | 3882 |
<div class="btn_popup_wrap"> |
| 3880 |
- <button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1','01');">재전송</button>
|
|
| 3883 |
+ <button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
|
|
| 3881 | 3884 |
</div> |
| 3882 | 3885 |
--%> |
| 3883 | 3886 |
<div class="btn_popup_wrap check_validity_wrap"> |
--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
... | ... | @@ -21,31 +21,39 @@ |
| 21 | 21 |
<script> |
| 22 | 22 |
$(document).ready(function(){
|
| 23 | 23 |
/* 목록 정렬 항목 아이콘 표시 */ |
| 24 |
- var searchSortCnd = $("[name='searchSortCnd']").val();
|
|
| 25 |
- var searchSortOrd = $("[name='searchSortOrd']").val();
|
|
| 24 |
+ var searchSortCnd = "${searchVO.searchSortCnd}";
|
|
| 25 |
+ var searchSortOrd = "${searchVO.searchSortOrd}";
|
|
| 26 | 26 |
if (searchSortCnd != "" && searchSortOrd != "" && searchSortCnd != undefined && searchSortOrd != undefined) {
|
| 27 | 27 |
var $sort_div = $("#sort_"+ searchSortCnd);
|
| 28 | 28 |
var sortClass = 'sortBtn' ; |
| 29 | 29 |
if (searchSortOrd == "desc") sortClass = "sortBtnDesc"; |
| 30 | 30 |
$sort_div.replaceClass('sortBtn' , sortClass) ;
|
| 31 | 31 |
$sort_div.attr("sortOrd", searchSortOrd);
|
| 32 |
- }; |
|
| 33 |
- |
|
| 32 |
+ } |
|
| 33 |
+ |
|
| 34 | 34 |
// 정렬 항목 이벤트 |
| 35 | 35 |
$(".sort").click(function(e) {
|
| 36 | 36 |
listSortOrd(this); |
| 37 | 37 |
}); |
| 38 |
- |
|
| 38 |
+ |
|
| 39 | 39 |
//목록 정렬 항목 클릭 |
| 40 | 40 |
function listSortOrd(obj){
|
| 41 | 41 |
var sortOrd = $(obj).attr("sortOrd");
|
| 42 | 42 |
var sortCnd = $(obj).attr("id");
|
| 43 | 43 |
|
| 44 |
- $("[name='searchSortCnd']").val(sortCnd.substring(5)); // 구분자 제거
|
|
| 45 |
- if (sortOrd == "desc") $("[name='searchSortOrd']").val("asc");
|
|
| 46 |
- else $("[name='searchSortOrd']").val("desc");
|
|
| 44 |
+ sortCnd = sortCnd.substring(5); // 구분자 제거 |
|
| 45 |
+ if (sortOrd == "desc") {
|
|
| 46 |
+ sortOrd = "asc"; |
|
| 47 |
+ } |
|
| 48 |
+ else {
|
|
| 49 |
+ sortOrd = "desc"; |
|
| 50 |
+ } |
|
| 51 |
+ |
|
| 52 |
+ document.sentListForm.searchSortCnd.value = sortCnd; |
|
| 53 |
+ document.sentListForm.searchSortOrd.value = sortOrd; |
|
| 47 | 54 |
getMjMsgSentListAll('1'); //각 JSP마다 다를때 메소드 정의해 줘야됨
|
| 48 |
- }; |
|
| 55 |
+ } |
|
| 56 |
+ |
|
| 49 | 57 |
}); |
| 50 | 58 |
|
| 51 | 59 |
//문자 재전송 |
... | ... | @@ -111,24 +119,48 @@ |
| 111 | 119 |
<div class="tb_wrap" style="min-height:428px;"> |
| 112 | 120 |
<table class="tType4"> |
| 113 | 121 |
<colgroup> |
| 114 |
- <col style="width: 13%;"> |
|
| 115 |
- <col style="width: 8%;"> |
|
| 116 |
- <col style="width: 9%;"> |
|
| 117 |
- <col style="width: 12%;"> |
|
| 122 |
+ <col style="width: 17%;"> |
|
| 123 |
+ <col style="width: 7%;"> |
|
| 124 |
+ <col style="width: 7%;"> |
|
| 125 |
+ <col style="width: 11%;"> |
|
| 118 | 126 |
<col style="width: *%;"> |
| 119 |
- <col style="width: 12%;"> |
|
| 127 |
+ <col style="width: 15%;"> |
|
| 120 | 128 |
<col style="width: 9%;"> |
| 121 | 129 |
<col style="width: 12%;"> |
| 122 | 130 |
</colgroup> |
| 123 | 131 |
<thead> |
| 124 | 132 |
<tr> |
| 125 |
- <th>발송일시</th> |
|
| 126 |
- <th>형태</th> |
|
| 127 |
- <th>발송방식</th> |
|
| 133 |
+ <th>발송일시 |
|
| 134 |
+ <div class="sort_wrap"> |
|
| 135 |
+ <input type="button" class="sort sortBtn" id="sort_reqdate"> |
|
| 136 |
+ </div> |
|
| 137 |
+ </th> |
|
| 138 |
+ <th>형태 |
|
| 139 |
+ <div class="sort_wrap"> |
|
| 140 |
+ <input type="button" class="sort sortBtn" id="sort_orderByCode"> |
|
| 141 |
+ </div> |
|
| 142 |
+ </th> |
|
| 143 |
+ <th>방식 |
|
| 144 |
+ <div class="sort_wrap"> |
|
| 145 |
+ <input type="button" class="sort sortBtn" id="sort_sendKind"> |
|
| 146 |
+ </div> |
|
| 147 |
+ </th> |
|
| 128 | 148 |
<th>내용</th> |
| 129 |
- <th>받는사람</th> |
|
| 130 |
- <th>발신번호</th> |
|
| 131 |
- <th>발송건수</th> |
|
| 149 |
+ <th>받는사람 |
|
| 150 |
+ <div class="sort_wrap"> |
|
| 151 |
+ <input type="button" class="sort sortBtn" id="sort_callTo"> |
|
| 152 |
+ </div> |
|
| 153 |
+ </th> |
|
| 154 |
+ <th>발신번호 |
|
| 155 |
+ <div class="sort_wrap"> |
|
| 156 |
+ <input type="button" class="sort sortBtn" id="sort_callFrom"> |
|
| 157 |
+ </div> |
|
| 158 |
+ </th> |
|
| 159 |
+ <th>건수 |
|
| 160 |
+ <div class="sort_wrap"> |
|
| 161 |
+ <input type="button" class="sort sortBtn" id="sort_msgGroupCnt"> |
|
| 162 |
+ </div> |
|
| 163 |
+ </th> |
|
| 132 | 164 |
<th>재전송 선택 </th> |
| 133 | 165 |
</tr> |
| 134 | 166 |
</thead> |
--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
... | ... | @@ -101,7 +101,7 @@ |
| 101 | 101 |
</th> |
| 102 | 102 |
<th>형태 |
| 103 | 103 |
<div class="sort_wrap"> |
| 104 |
- <input type="button" class="sort sortBtn" id="sort_msgType"> |
|
| 104 |
+ <input type="button" class="sort sortBtn" id="sort_orderByCode"> |
|
| 105 | 105 |
</div> |
| 106 | 106 |
</th> |
| 107 | 107 |
<th>발송방식 |
--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
... | ... | @@ -4,8 +4,6 @@ |
| 4 | 4 |
<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> |
| 5 | 5 |
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> |
| 6 | 6 |
<%@ page import="itn.com.cmm.LoginVO" %> |
| 7 |
-<!-- <script src="/publish/js/content.js"></script> --> |
|
| 8 |
-<script src="/publish/js/popupLayer.js"></script> |
|
| 9 | 7 |
|
| 10 | 8 |
<script type="text/javascript"> |
| 11 | 9 |
|
--- src/main/webapp/publish/js/popupLayer.js
+++ src/main/webapp/publish/js/popupLayer.js
... | ... | @@ -44,7 +44,9 @@ |
| 44 | 44 |
function close(t) {
|
| 45 | 45 |
var activeTarget = $('[data-tooltip-con="' + t + '"]');
|
| 46 | 46 |
activeTarget.hide().css('opacity','0');
|
| 47 |
- $('[data-tooltip="' + t + '"]').focus();
|
|
| 47 |
+ if (t != "rev_popup01") {
|
|
| 48 |
+ $('[data-tooltip="' + t + '"]').focus();
|
|
| 49 |
+ } |
|
| 48 | 50 |
} |
| 49 | 51 |
|
| 50 | 52 |
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?