문자재전송 작업중
@91bf9d0175b8fdaa34ed61405c617e002acaaf10
--- src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
+++ src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
... | ... | @@ -5993,6 +5993,8 @@ |
| 5993 | 5993 |
PaginationInfo paginationInfo = new PaginationInfo(); |
| 5994 | 5994 |
|
| 5995 | 5995 |
if(loginVO != null) {
|
| 5996 |
+ mjonMsgSentVO.setStateType("all");
|
|
| 5997 |
+ mjonMsgSentVO.setListType("groupList");
|
|
| 5996 | 5998 |
mjonMsgSentVO.setUserId(userId); |
| 5997 | 5999 |
|
| 5998 | 6000 |
// 검색 리스트 불러오기 |
--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
... | ... | @@ -3190,7 +3190,7 @@ |
| 3190 | 3190 |
} |
| 3191 | 3191 |
|
| 3192 | 3192 |
//문자 발송목록(msgSentType : 01:문자전송, 02:선거문자) |
| 3193 |
-function getMjMsgSentListAll(pageNo, msgSenTType) {
|
|
| 3193 |
+function getMjMsgSentListAll(pageNo, msgSentType) {
|
|
| 3194 | 3194 |
document.sentListForm.pageIndex.value = pageNo; |
| 3195 | 3195 |
|
| 3196 | 3196 |
var sendData= $(document.sentListForm).serializeArray(); |
... | ... | @@ -3211,11 +3211,6 @@ |
| 3211 | 3211 |
<form id="sentListForm" name="sentListForm" method="post"> |
| 3212 | 3212 |
<input type="hidden" id="pageType" name="pageType" value=""/> |
| 3213 | 3213 |
<input type="hidden" id="pageIndex" name="pageIndex" value=""/> |
| 3214 |
- <input type="hidden" id="msgGroupIdList" name="msgGroupIdList" value=""/> |
|
| 3215 |
- <input type="hidden" id="tabType" name="tabType" value="all"/><!-- 탭 종류 --> |
|
| 3216 |
- <input type="hidden" id="stateType" name="stateType" value="all"/><!-- 발송상태 종류 --> |
|
| 3217 |
- <input type="hidden" id="listType" name="listType" value="groupList"/><!-- 리스트 종류 --> |
|
| 3218 |
- <input type="hidden" id="addrGrpNm" name="addrGrpNm" value=""/><!-- 주소록 그룹 이름 --> |
|
| 3219 | 3214 |
</form> |
| 3220 | 3215 |
|
| 3221 | 3216 |
<!-- 2023 10 16 재전송 : 상세내용 팝업 --> |
... | ... | @@ -3227,33 +3222,10 @@ |
| 3227 | 3222 |
<button type="button" class="tooltip-close" data-focus="rev_popup01-close"><img |
| 3228 | 3223 |
src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
| 3229 | 3224 |
</div> |
| 3230 |
- <div class="layer_in"> |
|
| 3231 |
- <div class="rev_pop_in"> |
|
| 3232 |
- <div class="rev_pop_middle clearfix"> |
|
| 3233 |
- <span>발송일시 : 2021-05-28 16:52:30</span> |
|
| 3234 |
- <span class="msg_com msg_photo">MMS</span> |
|
| 3235 |
- <!-- 장문, 단문 일때 |
|
| 3236 |
- <span class="msg_com msg_long">LMS</span> |
|
| 3237 |
- <span class="msg_com msg_short">SMS</span>--> |
|
| 3238 |
- </div> |
|
| 3239 |
- <div class="rev_pop_txt"> |
|
| 3240 |
- <ul> |
|
| 3241 |
- <li><img src="/publish/images/content/thumb1.jpg" alt="발송된 그림문자 미리보기"></li> |
|
| 3242 |
- <li><img src="/publish/images/content/thumb2.jpg" alt="발송된 그림문자 미리보기"></li> |
|
| 3243 |
- <li><img src="/publish/images/content/thumb3.jpg" alt="발송된 그림문자 미리보기"></li> |
|
| 3244 |
- </ul> |
|
| 3245 |
- <div> |
|
| 3246 |
- <p class="deny_receipt">(광고) 무료거부 080-888-8282</p> |
|
| 3247 |
- <p class="rev_cont">안녕하세요. 문자온미용실 입니다.<br> |
|
| 3248 |
- 여름 맞이 이벤트 입니다.<br> |
|
| 3249 |
- 7월부터 8월까지 모든 염색 10만원(시세이도 및 탈색은 별도) |
|
| 3250 |
- </p> |
|
| 3251 |
- </div> |
|
| 3252 |
- </div> |
|
| 3253 |
- </div> |
|
| 3254 |
- <div class="popup_btn_wrap2" style="justify-content: center;"> |
|
| 3255 |
- <button type="button" class="tooltip-close" data-focus="rev_popup01-close" data-focus-next="rev_popup01">닫기</button> |
|
| 3256 |
- </div> |
|
| 3225 |
+ <div class="layer_in" id="msgSentDetailPopLoad" style="padding-bottom: 0px;"> |
|
| 3226 |
+ </div> |
|
| 3227 |
+ <div class="popup_btn_wrap2" style="justify-content: center; margin-bottom: 30px;"> |
|
| 3228 |
+ <button type="button" class="tooltip-close" data-focus="rev_popup01-close" data-focus-next="rev_popup01">닫기</button> |
|
| 3257 | 3229 |
</div> |
| 3258 | 3230 |
</div> |
| 3259 | 3231 |
</div> |
... | ... | @@ -3266,10 +3238,8 @@ |
| 3266 | 3238 |
<p><span>전송내역</p> |
| 3267 | 3239 |
<button type="button" class="tooltip-close" data-focus="popup05-close" id="btnLatestAddPhoneClose"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button> |
| 3268 | 3240 |
</div> |
| 3269 |
- <div class="layer_in" id="mjMsgSentListAllLoad" style="padding-bottom: 0px;"> |
|
| 3270 |
- |
|
| 3241 |
+ <div class="layer_in" id="mjMsgSentListAllLoad" style="padding-bottom: 0px; min-height:428px;"> |
|
| 3271 | 3242 |
</div> |
| 3272 |
- |
|
| 3273 | 3243 |
<div class="popup_btn_wrap2" style="margin-bottom: 30px;"> |
| 3274 | 3244 |
<button type="button" class="tooltip-close" data-focus="popup05-close" data-focus-next="popup05">닫기</button> |
| 3275 | 3245 |
</div> |
... | ... | @@ -3909,7 +3879,7 @@ |
| 3909 | 3879 |
<div class="btn_popup_wrap"> |
| 3910 | 3880 |
<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1','01');">재전송</button>
|
| 3911 | 3881 |
</div> |
| 3912 |
- --%> |
|
| 3882 |
+ --%> |
|
| 3913 | 3883 |
<div class="btn_popup_wrap check_validity_wrap"> |
| 3914 | 3884 |
<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button> |
| 3915 | 3885 |
<div class="error_hover_cont send_hover_cont"> |
--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
... | ... | @@ -44,70 +44,184 @@ |
| 44 | 44 |
$("[name='searchSortCnd']").val(sortCnd.substring(5)); // 구분자 제거
|
| 45 | 45 |
if (sortOrd == "desc") $("[name='searchSortOrd']").val("asc");
|
| 46 | 46 |
else $("[name='searchSortOrd']").val("desc");
|
| 47 |
- payUserListAjax('1'); //각 JSP마다 다를때 메소드 정의해 줘야됨
|
|
| 47 |
+ getMjMsgSentListAll('1'); //각 JSP마다 다를때 메소드 정의해 줘야됨
|
|
| 48 | 48 |
}; |
| 49 | 49 |
}); |
| 50 | 50 |
|
| 51 |
+//문자 재전송 |
|
| 52 |
+function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) {
|
|
| 53 |
+ if (replaceCnt > 0) {
|
|
| 54 |
+ alert("치환문자는 재전송 불가합니다.");
|
|
| 55 |
+ } |
|
| 56 |
+ else {
|
|
| 57 |
+ var title = ""; |
|
| 58 |
+ if (electionCnt > 0) {
|
|
| 59 |
+ title = "선거문자발송"; |
|
| 60 |
+ } |
|
| 61 |
+ else {
|
|
| 62 |
+ title = "문자발송"; |
|
| 63 |
+ } |
|
| 64 |
+ |
|
| 65 |
+ //if (confirm(title + " 화면으로 이동합니다.\n문자내용, 받는사람 확인후 발송해주세요.")) {
|
|
| 66 |
+ if (confirm("문자내용, 받는사람 확인후 발송해주세요.")) {
|
|
| 67 |
+ var form = document.reSendAllForm; |
|
| 68 |
+ form.msgResendAllFlag.value = "Y"; |
|
| 69 |
+ form.msgResendAllGroupId.value = msgGroupId; |
|
| 70 |
+ if (electionCnt > 0) {
|
|
| 71 |
+ form.action="/web/mjon/msgcampain/selectMsgDataView.do"; |
|
| 72 |
+ } |
|
| 73 |
+ else {
|
|
| 74 |
+ if (advertisementCnt > 0) {
|
|
| 75 |
+ // 광고문자 |
|
| 76 |
+ form.msgResendAllAdvertiseYn.value = "Y"; |
|
| 77 |
+ } |
|
| 78 |
+ form.action="/web/mjon/msgdata/selectMsgDataView.do"; |
|
| 79 |
+ } |
|
| 80 |
+ form.submit(); |
|
| 81 |
+ } |
|
| 82 |
+ } |
|
| 83 |
+} |
|
| 84 |
+ |
|
| 85 |
+//상세보기 버튼 실행 |
|
| 86 |
+function fnRevDetailPop(msgGroupId, msgId, fileCnt){
|
|
| 87 |
+ document.resPopForm.msgGroupId.value = msgGroupId; |
|
| 88 |
+ document.resPopForm.msgId.value = msgId; |
|
| 89 |
+ var sendData = $(document.resPopForm).serializeArray(); |
|
| 90 |
+ |
|
| 91 |
+ var form = document.searchForm; |
|
| 92 |
+ $("#msgSentDetailPopLoad").load("/web/mjon/msgsent/selectMsgSentDetailDataAjax.do", sendData ,function(response, status, xhr){
|
|
| 93 |
+ }); |
|
| 94 |
+} |
|
| 95 |
+ |
|
| 51 | 96 |
</script> |
| 52 | 97 |
|
| 98 |
+ <form id="resPopForm" name="resPopForm" method="post"> |
|
| 99 |
+ <input type="hidden" id="msgGroupId" name="msgGroupId" value=""/> |
|
| 100 |
+ <input type="hidden" id="msgId" name="msgId" value=""/> |
|
| 101 |
+ <input type="hidden" id="fileCnt" name="fileCnt" value=""/> |
|
| 102 |
+ <input type="hidden" id="resultType" name="resultType" value="S"/> |
|
| 103 |
+ </form> |
|
| 104 |
+ <form name="reSendAllForm" method="post"> |
|
| 105 |
+ <input type="hidden" name="msgResendAllFlag" value="N"/> |
|
| 106 |
+ <input type="hidden" name="msgResendAllGroupId" value=""/> |
|
| 107 |
+ <input type="hidden" name="msgResendAllAdvertiseYn" value="N"/> |
|
| 108 |
+ </form> |
|
| 109 |
+ |
|
| 53 | 110 |
<!-- 전송내역 불러오기 --> |
| 54 |
- <div class="tb_wrap" style="min-height:400px;"> |
|
| 111 |
+ <div class="tb_wrap" style="min-height:428px;"> |
|
| 55 | 112 |
<table class="tType4"> |
| 56 | 113 |
<colgroup> |
| 57 |
- <col style=""> |
|
| 58 |
- <col style=""> |
|
| 59 |
- <col style=""> |
|
| 60 |
- <col style=""> |
|
| 61 |
- <col style=""> |
|
| 62 |
- <col style=""> |
|
| 63 |
- <col style=""> |
|
| 64 |
- <col style=""> |
|
| 114 |
+ <col style="width: 13%;"> |
|
| 115 |
+ <col style="width: 8%;"> |
|
| 116 |
+ <col style="width: 9%;"> |
|
| 117 |
+ <col style="width: 12%;"> |
|
| 118 |
+ <col style="width: *%;"> |
|
| 119 |
+ <col style="width: 12%;"> |
|
| 120 |
+ <col style="width: 9%;"> |
|
| 121 |
+ <col style="width: 12%;"> |
|
| 65 | 122 |
</colgroup> |
| 66 | 123 |
<thead> |
| 67 | 124 |
<tr> |
| 68 |
- <th>발송일시 |
|
| 69 |
- <div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div> |
|
| 70 |
- </th> |
|
| 71 |
- <th>형태 |
|
| 72 |
- <div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div> |
|
| 73 |
- </th> |
|
| 74 |
- <th>발송방식 |
|
| 75 |
- <div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div> |
|
| 76 |
- </th> |
|
| 125 |
+ <th>발송일시</th> |
|
| 126 |
+ <th>형태</th> |
|
| 127 |
+ <th>발송방식</th> |
|
| 77 | 128 |
<th>내용</th> |
| 78 |
- <th>받는사람 |
|
| 79 |
- <div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div> |
|
| 80 |
- </th> |
|
| 81 |
- <th>발신번호 |
|
| 82 |
- <div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div> |
|
| 83 |
- </th> |
|
| 84 |
- <th>발송건수 |
|
| 85 |
- <div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div> |
|
| 86 |
- </th> |
|
| 129 |
+ <th>받는사람</th> |
|
| 130 |
+ <th>발신번호</th> |
|
| 131 |
+ <th>발송건수</th> |
|
| 87 | 132 |
<th>재전송 선택 </th> |
| 88 | 133 |
</tr> |
| 89 | 134 |
</thead> |
| 90 | 135 |
<tbody> |
| 136 |
+ <c:choose> |
|
| 137 |
+ <c:when test="${not empty mjMsgSentList}">
|
|
| 138 |
+ <c:forEach var="result" items="${mjMsgSentList}" varStatus="status">
|
|
| 139 |
+ <c:set var="replaceCnt" value="0" /> |
|
| 140 |
+ <c:set var="electionCnt" value="0" /> |
|
| 141 |
+ <c:set var="advertisementCnt" value="0" /> |
|
| 142 |
+ |
|
| 143 |
+ <c:if test="${fn:indexOf(result.smsTxt,'[*이름*]') != -1 || fn:indexOf(result.smsTxt,'[*1*]') != -1 || fn:indexOf(result.smsTxt,'[*2*]') != -1 || fn:indexOf(result.smsTxt,'[*3*]') != -1 || fn:indexOf(result.smsTxt,'[*4*]') != -1}">
|
|
| 144 |
+ <c:set var="replaceCnt" value="1" /> |
|
| 145 |
+ </c:if> |
|
| 146 |
+ <c:if test="${fn:indexOf(result.smsTxt,'(선거운동정보)') == 0}">
|
|
| 147 |
+ <c:set var="electionCnt" value="1" /> |
|
| 148 |
+ </c:if> |
|
| 149 |
+ <c:if test="${fn:indexOf(result.smsTxt,'(광고)') == 0}">
|
|
| 150 |
+ <c:set var="advertisementCnt" value="1" /> |
|
| 151 |
+ </c:if> |
|
| 152 |
+ <tr> |
|
| 153 |
+ <td> |
|
| 154 |
+ <fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.reqdate}" />
|
|
| 155 |
+ </td> |
|
| 156 |
+ <td> |
|
| 157 |
+ <c:choose> |
|
| 158 |
+ <c:when test="${result.msgType eq '6' && result.fileCnt eq 0 }">
|
|
| 159 |
+ 장문 |
|
| 160 |
+ </c:when> |
|
| 161 |
+ <c:when test="${result.msgType eq '6' && result.fileCnt ne 0 }">
|
|
| 162 |
+ 그림 |
|
| 163 |
+ </c:when> |
|
| 164 |
+ <c:otherwise> |
|
| 165 |
+ 단문 |
|
| 166 |
+ </c:otherwise> |
|
| 167 |
+ </c:choose> |
|
| 168 |
+ </td> |
|
| 169 |
+ <td> |
|
| 170 |
+ <c:choose> |
|
| 171 |
+ <c:when test="${result.sendKind eq 'H' }">
|
|
| 172 |
+ WEB |
|
| 173 |
+ </c:when> |
|
| 174 |
+ <c:when test="${result.sendKind eq 'A'}">
|
|
| 175 |
+ API |
|
| 176 |
+ </c:when> |
|
| 177 |
+ <c:otherwise> |
|
| 178 |
+ - |
|
| 179 |
+ </c:otherwise> |
|
| 180 |
+ </c:choose> |
|
| 181 |
+ </td> |
|
| 182 |
+ <td> |
|
| 183 |
+ <button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${result.msgGroupId}','${result.msgId}','${result.fileCnt}'); return false;">상세보기</button>
|
|
| 184 |
+ </td> |
|
| 185 |
+ <td> |
|
| 186 |
+ <c:choose> |
|
| 187 |
+ <c:when test="${result.msgGroupCnt > 1}">
|
|
| 188 |
+ <p> |
|
| 189 |
+ <c:choose> |
|
| 190 |
+ <c:when test="${result.addrNm ne '-' and result.addrNm ne ''}">
|
|
| 191 |
+ <c:out value="${result.addrNm}"/>
|
|
| 192 |
+ </c:when> |
|
| 193 |
+ <c:otherwise> |
|
| 194 |
+ <c:out value="${result.callToComma}"/>
|
|
| 195 |
+ </c:otherwise> |
|
| 196 |
+ </c:choose> 외 <fmt:formatNumber value="${result.msgGroupCnt - 1}" pattern="#,###"/>명
|
|
| 197 |
+ </p> |
|
| 198 |
+ </c:when> |
|
| 199 |
+ <c:when test="${result.addrNm ne '-' and result.addrNm ne ''}">
|
|
| 200 |
+ <p><c:out value="${result.addrNm}"/></p>
|
|
| 201 |
+ </c:when> |
|
| 202 |
+ <c:otherwise> |
|
| 203 |
+ <p><c:out value="${result.callToComma}"/></p>
|
|
| 204 |
+ </c:otherwise> |
|
| 205 |
+ </c:choose> |
|
| 206 |
+ </td> |
|
| 207 |
+ <td> |
|
| 208 |
+ <c:out value="${result.callFromComma}"/>
|
|
| 209 |
+ </td> |
|
| 210 |
+ <td> |
|
| 211 |
+ <c:out value="${result.msgGroupCnt}"/>
|
|
| 212 |
+ </td> |
|
| 213 |
+ <td> |
|
| 214 |
+ <button class="btnType btnType24" onClick="javascript:fnMjMsgReSendAll('${result.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>
|
|
| 215 |
+ </td> |
|
| 216 |
+ </tr> |
|
| 217 |
+ </c:forEach> |
|
| 218 |
+ </c:when> |
|
| 219 |
+ <c:otherwise> |
|
| 91 | 220 |
<tr> |
| 92 |
- <td>2023-06-10 17:50</td> |
|
| 93 |
- <td>그림</td> |
|
| 94 |
- <td>WEB</td> |
|
| 95 |
- <td><button class="btnType btnType20" data-tooltip="rev_popup01" type="button">상세보기</button></td> |
|
| 96 |
- <td>010-1547-5895 외 1명</td> |
|
| 97 |
- <td>010-5897-7895</td> |
|
| 98 |
- <td>8</td> |
|
| 99 |
- <td><button class="btnType btnType24" type="button">재전송</button></td> |
|
| 221 |
+ <td colspan="8">발송 내역이 없습니다.</td> |
|
| 100 | 222 |
</tr> |
| 101 |
- <tr> |
|
| 102 |
- <td>2023-06-10 17:50</td> |
|
| 103 |
- <td>그림</td> |
|
| 104 |
- <td>WEB</td> |
|
| 105 |
- <td><button class="btnType btnType20" data-tooltip="rev_popup01" type="button">상세보기</button></td> |
|
| 106 |
- <td>010-1547-5895 외 1명</td> |
|
| 107 |
- <td>010-5897-7895</td> |
|
| 108 |
- <td>8</td> |
|
| 109 |
- <td><button class="btnType btnType24" type="button">재전송</button></td> |
|
| 110 |
- </tr> |
|
| 223 |
+ </c:otherwise> |
|
| 224 |
+ </c:choose> |
|
| 111 | 225 |
</tbody> |
| 112 | 226 |
</table> |
| 113 | 227 |
</div> |
... | ... | @@ -120,3 +234,5 @@ |
| 120 | 234 |
</ul> |
| 121 | 235 |
</c:if> |
| 122 | 236 |
<!-- pagination --> |
| 237 |
+ |
|
| 238 |
+(No newline at end of file) |
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?