Merge branch 'master' into 5102_친구톡_발송속도_개선
@dfc2ad11d5f43a87c6f73b67b21699734b05bca3
--- src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentDAO.java
+++ src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentDAO.java
... | ... | @@ -126,8 +126,13 @@ |
| 126 | 126 |
} |
| 127 | 127 |
|
| 128 | 128 |
//발송 관리 문자발송 내용 상세보기 팝업[그룹] |
| 129 |
- public MjonKakaoATVO selectKakaoSentDetailViewPhoneAjax(MjonKakaoATVO KakaoSentVO) throws Exception{
|
|
| 130 |
- return (MjonKakaoATVO) select("KakaoSentDAO.selectKakaoSentDetailViewPhoneAjax", KakaoSentVO);
|
|
| 131 |
- } |
|
| 129 |
+ public MjonKakaoATVO selectKakaoSentDetailViewPhoneAjax(MjonKakaoATVO KakaoSentVO) throws Exception{
|
|
| 130 |
+ return (MjonKakaoATVO) select("KakaoSentDAO.selectKakaoSentDetailViewPhoneAjax", KakaoSentVO);
|
|
| 131 |
+ } |
|
| 132 |
+ |
|
| 133 |
+ @SuppressWarnings("unchecked")
|
|
| 134 |
+ public List<KakaoSentVO> selectAllKakaoSentListExcel_advc(KakaoSentVO kakaoSentVO) throws Exception{
|
|
| 135 |
+ return (List<KakaoSentVO>) list("KakaoSentDAO.selectAllKakaoSentListExcel_advc",kakaoSentVO);
|
|
| 136 |
+ } |
|
| 132 | 137 |
|
| 133 | 138 |
} |
--- src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java
+++ src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java
... | ... | @@ -302,9 +302,13 @@ |
| 302 | 302 |
result.setKakaoResendSuccCount(eachCnt.getKakaoResendSuccCount()); |
| 303 | 303 |
result.setKakaoResendFailCount(eachCnt.getKakaoResendFailCount()); |
| 304 | 304 |
|
| 305 |
+ result.setMsgGroupCnt( |
|
| 306 |
+ Integer.valueOf(result.getSuccessCount() + result.getWaitCount() + result.getFailCount()).toString() |
|
| 307 |
+ ); |
|
| 305 | 308 |
|
| 306 | 309 |
//완료상태 시작 |
| 307 | 310 |
result = this.codeProc(result); |
| 311 |
+ |
|
| 308 | 312 |
|
| 309 | 313 |
//완료상태 끝 |
| 310 | 314 |
//======================================================= |
... | ... | @@ -470,7 +474,7 @@ |
| 470 | 474 |
} |
| 471 | 475 |
|
| 472 | 476 |
//예약 관리 리스트 불러오기 |
| 473 |
- List<KakaoSentVO> resultList = kakaoSentDAO.selectAllKakaoSentList_advc(kakaoSentVO); |
|
| 477 |
+ List<KakaoSentVO> resultList = kakaoSentDAO.selectAllKakaoSentListExcel_advc(kakaoSentVO); |
|
| 474 | 478 |
|
| 475 | 479 |
// long startTime = System.nanoTime(); // 시작 시간 측정 |
| 476 | 480 |
// resultAllSentList = makeDetailFunction(resultAllSentList); |
--- src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java
+++ src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java
... | ... | @@ -211,7 +211,7 @@ |
| 211 | 211 |
|
| 212 | 212 |
// 외부에서 선거발송 페이지로 들어오는걸 막음 |
| 213 | 213 |
// 20250102 이호영 |
| 214 |
- if (!"localhost".equals(hostName)) {
|
|
| 214 |
+ if (!"localhost".equals(hostName) && !"119.193.215.98".equals(hostName)) {
|
|
| 215 | 215 |
return "redirect:/web/mjon/msgdata/selectMsgDataView.do"; |
| 216 | 216 |
} |
| 217 | 217 |
|
--- src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
... | ... | @@ -1357,6 +1357,111 @@ |
| 1357 | 1357 |
|
| 1358 | 1358 |
<!-- 전체 발송결과 조회 (그룹별)--> |
| 1359 | 1359 |
<select id="KakaoSentDAO.selectAllKakaoSentList_advc" parameterClass="kakaoSentVO" resultClass="kakaoSentVO"> |
| 1360 |
+ /* KakaoSentDAO.selectAllKakaoSentList_advc */ |
|
| 1361 |
+ |
|
| 1362 |
+ SELECT COUNT(B.USER_ID) OVER () AS totMsgCnt, |
|
| 1363 |
+ B.USER_ID AS userId, |
|
| 1364 |
+ B.MSG_GROUP_ID AS msgGroupId, |
|
| 1365 |
+ B.SMS_TXT AS smsTxt, |
|
| 1366 |
+ B.SUBJECT AS subject, |
|
| 1367 |
+ B.SUBJECT_CHK_YN AS subjectChkYn, |
|
| 1368 |
+ B.REGDATE AS regDate, |
|
| 1369 |
+ B.REQ_DATE AS reqDate, |
|
| 1370 |
+ CASE |
|
| 1371 |
+ WHEN B.DELAY_YN = 'Y' AND B.DELAY_COMPLETE_YN = 'N' |
|
| 1372 |
+ THEN DATE_ADD(B.REQ_DATE, INTERVAL -30 MINUTE) |
|
| 1373 |
+ ELSE B.REQ_DATE |
|
| 1374 |
+ END AS delayOrgTime, |
|
| 1375 |
+ B.CALL_FROM AS callFrom, |
|
| 1376 |
+ B.TOT_PRICE AS totPrice, |
|
| 1377 |
+ B.EACH_PRICE AS eachPrice, |
|
| 1378 |
+ B.MSG_TYPE AS msgType, |
|
| 1379 |
+ B.FILE_CNT AS fileCnt, |
|
| 1380 |
+ B.AGENT_CODE AS agentCode, |
|
| 1381 |
+ B.CANCELDATE AS canceldate, |
|
| 1382 |
+ B.DEL_FLAG AS delFlag, |
|
| 1383 |
+ B.SEND_KIND AS sendKind, |
|
| 1384 |
+ B.MSG_KIND AS msgKind, |
|
| 1385 |
+ B.DELAY_YN AS delayYn, |
|
| 1386 |
+ B.DELAY_COMPLETE_YN AS delayCompleteYn, |
|
| 1387 |
+ B.RESERVE_YN AS reserveYn, |
|
| 1388 |
+ B.RESERVE_C_YN AS reserveCYn, |
|
| 1389 |
+ TIMESTAMPDIFF( |
|
| 1390 |
+ MINUTE, |
|
| 1391 |
+ CAST(DATE_FORMAT(B.REQ_DATE, '%Y-%m-%d %H:%i') AS CHAR), |
|
| 1392 |
+ DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i') |
|
| 1393 |
+ ) AS diffMin, |
|
| 1394 |
+ B.AT_DELAY_YN AS atDelayYn, |
|
| 1395 |
+ B.AT_DELAY_COMPLETE_YN AS atDelayCompleteYn, |
|
| 1396 |
+ A.MSG_NOTICETALK_SENDER_KEY AS msgNoticetalkSenderKey, |
|
| 1397 |
+ A.BIZ_KAKAO_RESEND_YN AS bizKakaoResendYn, |
|
| 1398 |
+ CASE |
|
| 1399 |
+ WHEN B.AT_DELAY_YN = 'Y' AND B.AT_DELAY_COMPLETE_YN = 'N' |
|
| 1400 |
+ THEN DATE_ADD(B.REQ_DATE, INTERVAL -30 MINUTE) |
|
| 1401 |
+ ELSE B.REQ_DATE |
|
| 1402 |
+ END AS atDelayOrgTime, |
|
| 1403 |
+ C.YELLOW_ID AS yellowId |
|
| 1404 |
+ FROM MJ_MSG_GROUP_DATA B |
|
| 1405 |
+ INNER JOIN ( |
|
| 1406 |
+ select MSG_GROUP_ID, MSG_TYPE, DEL_FLAG, MSG_NOTICETALK_SENDER_KEY, BIZ_KAKAO_RESEND_YN |
|
| 1407 |
+ from MJ_MSG_DATA |
|
| 1408 |
+ where DEL_FLAG = 'N' |
|
| 1409 |
+ <isNotEmpty property="tabType"> |
|
| 1410 |
+ <isEqual property="tabType" compareValue="at"> |
|
| 1411 |
+ AND MSG_TYPE = '8' |
|
| 1412 |
+ </isEqual> |
|
| 1413 |
+ <isEqual property="tabType" compareValue="ft"> |
|
| 1414 |
+ AND MSG_TYPE = '9' |
|
| 1415 |
+ </isEqual> |
|
| 1416 |
+ <isEqual property="tabType" compareValue="all"> |
|
| 1417 |
+ AND MSG_TYPE IN ('8','9')
|
|
| 1418 |
+ </isEqual> |
|
| 1419 |
+ </isNotEmpty> |
|
| 1420 |
+ <isEmpty property="tabType"> |
|
| 1421 |
+ AND MSG_TYPE IN ('8','9')
|
|
| 1422 |
+ </isEmpty> |
|
| 1423 |
+ group by MSG_GROUP_ID) A |
|
| 1424 |
+ ON A.MSG_GROUP_ID = B.MSG_GROUP_ID |
|
| 1425 |
+ LEFT JOIN MJ_KAKAO_PROFILE_INFO C |
|
| 1426 |
+ ON A.MSG_NOTICETALK_SENDER_KEY = C.SENDER_KEY |
|
| 1427 |
+ WHERE ( |
|
| 1428 |
+ B.DEL_FLAG = 'N' OR B.DEL_FLAG IS NULL |
|
| 1429 |
+ ) |
|
| 1430 |
+ AND B.USER_ID = #userId# |
|
| 1431 |
+ <isNotEmpty property="startDate"> |
|
| 1432 |
+ AND DATE_FORMAT(B.REGDATE, '%Y-%m-%d') <![CDATA[ >= ]]> DATE_FORMAT(#startDate#, '%Y-%m-%d') |
|
| 1433 |
+ </isNotEmpty> |
|
| 1434 |
+ <isNotEmpty property="endDate"> |
|
| 1435 |
+ AND DATE_FORMAT(B.REGDATE, '%Y-%m-%d') <![CDATA[ <= ]]> DATE_FORMAT(#endDate#, '%Y-%m-%d') |
|
| 1436 |
+ </isNotEmpty> |
|
| 1437 |
+ <isNotEmpty property="stateType"> |
|
| 1438 |
+ <isEqual property="stateType" compareValue="Y"> |
|
| 1439 |
+ AND B.RESERVE_YN = 'Y' |
|
| 1440 |
+ </isEqual> |
|
| 1441 |
+ <isEqual property="stateType" compareValue="N"> |
|
| 1442 |
+ AND B.RESERVE_YN = 'N' |
|
| 1443 |
+ </isEqual> |
|
| 1444 |
+ </isNotEmpty> |
|
| 1445 |
+ <isNotEmpty property="searchKeyword"> |
|
| 1446 |
+ <isEqual property="searchCondition" compareValue="3"> |
|
| 1447 |
+ AND B.SMS_TXT like CONCAT('%', #searchKeyword#, '%')
|
|
| 1448 |
+ </isEqual> |
|
| 1449 |
+ </isNotEmpty> |
|
| 1450 |
+ GROUP BY B.MSG_GROUP_ID |
|
| 1451 |
+ ORDER BY 1=1 |
|
| 1452 |
+ <isNotEmpty property="searchSortCnd"> |
|
| 1453 |
+ ,$searchSortCnd$ |
|
| 1454 |
+ </isNotEmpty> |
|
| 1455 |
+ <isNotEmpty property="searchSortOrd"> |
|
| 1456 |
+ $searchSortOrd$ |
|
| 1457 |
+ </isNotEmpty> |
|
| 1458 |
+ LIMIT #recordCountPerPage# |
|
| 1459 |
+ OFFSET #firstIndex# |
|
| 1460 |
+ |
|
| 1461 |
+ </select> |
|
| 1462 |
+ |
|
| 1463 |
+ <!-- 전체 발송결과 조회 (그룹별)--> |
|
| 1464 |
+ <select id="KakaoSentDAO.selectAllKakaoSentListExcel_advc" parameterClass="kakaoSentVO" resultClass="kakaoSentVO"> |
|
| 1360 | 1465 |
/* KakaoSentDAO.selectAllKakaoSentList_advc */ |
| 1361 | 1466 |
SELECT t1.totMsgCnt, |
| 1362 | 1467 |
t1.userId, |
... | ... | @@ -1612,7 +1717,7 @@ |
| 1612 | 1717 |
WHEN COUNT(DISTINCT t1.REQ_DATE) > 1 THEN 'Y' |
| 1613 | 1718 |
ELSE 'N' |
| 1614 | 1719 |
END AS divideYN |
| 1615 |
- FROM mj_msg_data t1 |
|
| 1720 |
+ FROM mj_msg_data t1 FORCE INDEX (idx_msgdata_groupid_delfalg_msgtype_curstate) |
|
| 1616 | 1721 |
LEFT OUTER JOIN BIZ_LOG BL1 ON t1.BIZ_UMID = BL1.CMID |
| 1617 | 1722 |
WHERE |
| 1618 | 1723 |
t1.DEL_FLAG = 'N' |
--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
... | ... | @@ -970,7 +970,7 @@ |
| 970 | 970 |
var denyTxtLeng = conByteLeng('무료 거부 080-880-0858');
|
| 971 | 971 |
|
| 972 | 972 |
var campFrtTxtLeng = conByteLeng('(선거운동정보)');
|
| 973 |
- var campLstTxtLeng = conByteLeng('후보자전화번호 불법수집정보 신고번호 118번 무료 거부 080-880-0858');
|
|
| 973 |
+ var campLstTxtLeng = conByteLeng('후보자전화번호 불법수집정보 신고번호 : 선거관리위원회 ☎1390 무료 거부 080-880-0858');
|
|
| 974 | 974 |
|
| 975 | 975 |
//일반문자, 광고문자에 따른 문자 길이 변경해주기 |
| 976 | 976 |
if(msgKind == "N"){
|
... | ... | @@ -4595,7 +4595,8 @@ |
| 4595 | 4595 |
<td> |
| 4596 | 4596 |
<c:choose> |
| 4597 | 4597 |
<c:when test="${not empty mjonMsgDelaySentList.regDate}">
|
| 4598 |
- <fmt:formatDate value="${mjonMsgDelaySentList.regDate}" pattern="yyyy-MM-dd HH:mm"/>
|
|
| 4598 |
+<%-- <fmt:formatDate value="${mjonMsgDelaySentList.regDate}" pattern="yyyy-MM-dd HH:mm"/> --%>
|
|
| 4599 |
+ <c:out value="${mjonMsgDelaySentList.regDate}" />
|
|
| 4599 | 4600 |
</c:when> |
| 4600 | 4601 |
<c:otherwise> |
| 4601 | 4602 |
- |
... | ... | @@ -4613,7 +4614,8 @@ |
| 4613 | 4614 |
<c:otherwise> |
| 4614 | 4615 |
<c:choose> |
| 4615 | 4616 |
<c:when test="${mjonMsgDelaySentList.delayYn eq 'Y'}">
|
| 4616 |
- [스미싱의심] <fmt:formatDate value="${mjonMsgDelaySentList.reqDate}" pattern="yyyy-MM-dd HH:mm"/>
|
|
| 4617 |
+ [스미싱의심] <c:out value="${mjonMsgDelaySentList.regDate}" />
|
|
| 4618 |
+<%-- [스미싱의심] <fmt:formatDate value="${mjonMsgDelaySentList.reqDate}" pattern="yyyy-MM-dd HH:mm"/> --%>
|
|
| 4617 | 4619 |
</c:when> |
| 4618 | 4620 |
<c:otherwise> |
| 4619 | 4621 |
- |
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp
... | ... | @@ -903,6 +903,8 @@ |
| 903 | 903 |
<input type="hidden" name="searchCondition" value="<c:out value='${searchVO.searchCondition }' />" />
|
| 904 | 904 |
<input type="hidden" name="searchKeyword" value="<c:out value='${searchVO.searchKeyword }' />" />
|
| 905 | 905 |
<input type="hidden" name="pageUnit" value="<c:out value='${searchVO.pageUnit }' />" />
|
| 906 |
+ <input type="hidden" name="tabType" value="<c:out value='${searchVO.tabType }' />" />
|
|
| 907 |
+ <input type="hidden" name="stateType" value="<c:out value='${searchVO.stateType }' />" />
|
|
| 906 | 908 |
</form> |
| 907 | 909 |
|
| 908 | 910 |
<!-- 예약 취소 --> |
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp
... | ... | @@ -16,7 +16,82 @@ |
| 16 | 16 |
var threefulstday = ""; //3개월전 시작일 |
| 17 | 17 |
var threefuledday = ""; //3개월전 마지막일 |
| 18 | 18 |
|
| 19 |
+function firstLodingSet(){
|
|
| 20 |
+ var html = ""; |
|
| 21 |
+ html += '<div class="list_info">'; |
|
| 22 |
+ html += ' <p>총 발송건수 <span class="c_e40000">0</span>건</p>'; |
|
| 23 |
+ html += ' <div>'; |
|
| 24 |
+ html += ' <p class="cf_text c_e40000">※ 예약 발송취소는 예약 발송시간 기준 5분 전까지만 가능</p>'; |
|
| 25 |
+ html += ' <label for="pageUnit" class="label">줄보기 선택</label>'; |
|
| 26 |
+ html += ' <select id="pageUnit" name="pageUnit" class="selType2">'; |
|
| 27 |
+ html += ' <option value="10" selected>10개보기</option>'; |
|
| 28 |
+ html += ' </select>'; |
|
| 29 |
+ html += ' </div>'; |
|
| 30 |
+ html += '</div>'; |
|
| 31 |
+ html += '<div class="tb_wrap">'; |
|
| 32 |
+ html += ' <table class="tType4">'; |
|
| 33 |
+ html += ' <colgroup>'; |
|
| 34 |
+ html += ' <col style="width: 45px;">'; |
|
| 35 |
+ html += ' <col style="width: 12%;">'; |
|
| 36 |
+ html += ' <col style="width: 7%;">'; |
|
| 37 |
+ html += ' <col style="width: auto;">'; |
|
| 38 |
+ html += ' <col style="width: 7%;">'; |
|
| 39 |
+ html += ' <col style="width: 6%;">'; |
|
| 40 |
+ html += ' <col style="width: 6%;">'; |
|
| 41 |
+ html += ' <col style="width: 6%;">'; |
|
| 42 |
+ html += ' <col style="width: 6%;">'; |
|
| 43 |
+ html += ' <col style="width: 6%;">'; |
|
| 44 |
+ html += ' <col style="width: 8%;">'; |
|
| 45 |
+ html += ' <col style="width: 8%;">'; |
|
| 46 |
+ html += ' </colgroup>'; |
|
| 47 |
+ html += ' <thead>'; |
|
| 48 |
+ html += ' <tr>'; |
|
| 49 |
+ html += ' <th rowspan="2">'; |
|
| 50 |
+ html += ' <label for="" class="label">전체 선택</label>'; |
|
| 51 |
+ html += ' <input type="checkbox" id="allCheck" name="allCheck">'; |
|
| 52 |
+ html += ' </th>'; |
|
| 53 |
+ html += ' <th rowspan="2">발송일시'; |
|
| 54 |
+ html += ' <div class="sort_wrap">'; |
|
| 55 |
+ html += ' <input type="button" class="sort sortBtn" id="sort_reqdate">'; |
|
| 56 |
+ html += ' </div>'; |
|
| 57 |
+ html += ' </th>'; |
|
| 58 |
+ html += ' <th rowspan="2">형태'; |
|
| 59 |
+ html += ' <div class="sort_wrap">'; |
|
| 60 |
+ html += ' <input type="button" class="sort sortBtn" id="sort_orderByCode">'; |
|
| 61 |
+ html += ' </div>'; |
|
| 62 |
+ html += ' </th>'; |
|
| 63 |
+ html += ' <th rowspan="2">내용</th>'; |
|
| 64 |
+ html += ' <th rowspan="2">발송건수'; |
|
| 65 |
+ html += ' <div class="sort_wrap">'; |
|
| 66 |
+ html += ' <input type="button" class="sort sortBtn" id="sort_msgGroupCnt">'; |
|
| 67 |
+ html += ' </div>'; |
|
| 68 |
+ html += ' </th>'; |
|
| 69 |
+ html += ' <th rowspan="2">대기</th>'; |
|
| 70 |
+ html += ' <th colspan="2">카카오톡결과</th>'; |
|
| 71 |
+ html += ' <th colspan="2">대체문자결과</th>'; |
|
| 72 |
+ html += ' <th rowspan="2">금액(원)</th>'; |
|
| 73 |
+ html += ' <th rowspan="2">진행상황</th>'; |
|
| 74 |
+ html += ' </tr>'; |
|
| 75 |
+ html += ' <tr>'; |
|
| 76 |
+ html += ' <th>성공</th>'; |
|
| 77 |
+ html += ' <th>실패</th>'; |
|
| 78 |
+ html += ' <th>성공</th>'; |
|
| 79 |
+ html += ' <th>실패</th>'; |
|
| 80 |
+ html += ' </tr>'; |
|
| 81 |
+ html += ' </thead>'; |
|
| 82 |
+ html += ' <tbody>'; |
|
| 83 |
+ html += ' <tr><td colspan="12">LOADING...</td></tr>'; |
|
| 84 |
+ html += ' </tbody>'; |
|
| 85 |
+ html += ' </table>'; |
|
| 86 |
+ html += '</div>'; |
|
| 87 |
+ |
|
| 88 |
+ $(".msgSentAllLoad").html(html);
|
|
| 89 |
+} |
|
| 90 |
+ |
|
| 91 |
+ |
|
| 19 | 92 |
$(document).ready(function(){
|
| 93 |
+ |
|
| 94 |
+ firstLodingSet(); |
|
| 20 | 95 |
|
| 21 | 96 |
//초기 전체 리스트 페이지 보여주기 |
| 22 | 97 |
var form = document.searchForm; |
... | ... | @@ -417,8 +492,10 @@ |
| 417 | 492 |
<input type="hidden" id="msgGroupIdList" name="msgGroupIdList" value=""/> |
| 418 | 493 |
<input type="hidden" name="searchSortCnd" value="<c:out value="${searchVO.searchSortCnd}" />" />
|
| 419 | 494 |
<input type="hidden" name="searchSortOrd" value="<c:out value="${searchVO.searchSortOrd}" />" />
|
| 420 |
- <input type="hidden" id="tabType" name="tabType" value="all"/><!-- 탭 종류 --> |
|
| 421 |
- <input type="hidden" id="stateType" name="stateType" value="all"/><!-- 발송상태 종류 --> |
|
| 495 |
+ <!-- <input type="hidden" id="tabType" name="tabType" value="all"/>탭 종류 --> |
|
| 496 |
+ <input type="hidden" id="tabType" name="tabType" value="${searchVO.tabType}"/><!-- 탭 종류 -->
|
|
| 497 |
+ <!-- <input type="hidden" id="stateType" name="stateType" value="all"/>발송상태 종류 --> |
|
| 498 |
+ <input type="hidden" id="stateType" name="stateType" value="${searchVO.stateType}"/><!-- 발송상태 종류 -->
|
|
| 422 | 499 |
<input type="hidden" id="listType" name="listType" value="groupList"/><!-- 리스트 종류 --> |
| 423 | 500 |
<input type="hidden" id="addrGrpNm" name="addrGrpNm" value=""/><!-- 주소록 그룹 이름 --> |
| 424 | 501 |
<input type="hidden" id="mberId" name="mberId" value="${LoginVO.id}"/><!-- 주소록 그룹 이름 -->
|
... | ... | @@ -584,7 +661,7 @@ |
| 584 | 661 |
<!-- <div class="on_active">받는사람(전송건별)</div> --> |
| 585 | 662 |
<!-- </div> --> |
| 586 | 663 |
<ul> |
| 587 |
- <li class="tab active"> |
|
| 664 |
+ <li class="tab <c:if test="${searchVO.stateType eq 'all' || searchVO.stateType eq '' || empty searchVO.stateType}">active</c:if>">
|
|
| 588 | 665 |
<button type="button" onclick="fnListLoad('all','0'); return false;">전체</button>
|
| 589 | 666 |
</li> |
| 590 | 667 |
<!-- <li class="tab"> |
... | ... | @@ -596,10 +673,10 @@ |
| 596 | 673 |
<li class="tab"> |
| 597 | 674 |
<button type="button" onclick="fnListLoad('fail','3'); return false;">수신오류</button>
|
| 598 | 675 |
</li> --> |
| 599 |
- <li class="tab"> |
|
| 676 |
+ <li class="tab <c:if test="${searchVO.stateType eq 'N'}">active</c:if>">
|
|
| 600 | 677 |
<button type="button" onclick="fnListLoad('N','1'); return false;">즉시</button>
|
| 601 | 678 |
</li> |
| 602 |
- <li class="tab"> |
|
| 679 |
+ <li class="tab" <c:if test="${searchVO.stateType eq 'Y'}">active</c:if>>
|
|
| 603 | 680 |
<button type="button" onclick="fnListLoad('Y','2'); return false;">예약</button>
|
| 604 | 681 |
</li> |
| 605 | 682 |
</ul> |
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
... | ... | @@ -2475,10 +2475,10 @@ |
| 2475 | 2475 |
var callFrom = $("#callFromList option:selected").val();
|
| 2476 | 2476 |
|
| 2477 | 2477 |
var advStr = '<div class="ad_txt"><p>(선거운동정보)</p></div>'; |
| 2478 |
- var advDenyStr = '<div class="deny_txt">후보자전화번호 ' + callFrom + '<br/>불법수집정보 신고번호 118번<br/>무료거부 0808800858</div>'; |
|
| 2478 |
+ var advDenyStr = '<div class="deny_txt">후보자전화번호 ' + callFrom + '<br/>불법수집정보 신고번호 : 선거관리위원회 ☎1390<br/>무료거부 0808800858</div>'; |
|
| 2479 | 2479 |
|
| 2480 | 2480 |
var preAdvStr = '<p class="ad_tit">(선거운동정보)</p>'; |
| 2481 |
- var preAdvDenyStr = '<p class="deny_receipt">후보자전화번호 ' + callFrom + '<br>불법수집정보 신고번호 118번<br>무료거부 0808800858</p>'; |
|
| 2481 |
+ var preAdvDenyStr = '<p class="deny_receipt">후보자전화번호 ' + callFrom + '<br>불법수집정보 신고번호 : 선거관리위원회 ☎1390<br>무료거부 0808800858</p>'; |
|
| 2482 | 2482 |
|
| 2483 | 2483 |
//광고 및 무료수신거부 텍스트 추가 |
| 2484 | 2484 |
if ($("#send_adYnY").val() == 'Y'){
|
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp
... | ... | @@ -2755,10 +2755,10 @@ |
| 2755 | 2755 |
var callFrom = $("#callFromList option:selected").val();
|
| 2756 | 2756 |
|
| 2757 | 2757 |
var advStr = '<div class="ad_txt"><p>(선거운동정보)</p></div>'; |
| 2758 |
- var advDenyStr = '<div class="deny_txt">후보자전화번호 ' + callFrom + '<br/>불법수집정보 신고번호 118번<br/>무료거부 0808800858</div>'; |
|
| 2758 |
+ var advDenyStr = '<div class="deny_txt">후보자전화번호 ' + callFrom + '<br/>불법수집정보 신고번호 : 선거관리위원회 ☎1390<br/>무료거부 0808800858</div>'; |
|
| 2759 | 2759 |
|
| 2760 | 2760 |
var preAdvStr = '<p class="ad_tit">(선거운동정보)</p>'; |
| 2761 |
- var preAdvDenyStr = '<p class="deny_receipt">후보자전화번호 ' + callFrom + '<br>불법수집정보 신고번호 118번<br>무료거부 0808800858</p>'; |
|
| 2761 |
+ var preAdvDenyStr = '<p class="deny_receipt">후보자전화번호 ' + callFrom + '<br>불법수집정보 신고번호 : 선거관리위원회 ☎1390<br>무료거부 0808800858</p>'; |
|
| 2762 | 2762 |
|
| 2763 | 2763 |
//선거 및 무료수신거부 텍스트 추가 |
| 2764 | 2764 |
if ($('input[name=send_adYn]:checked').val() == 'Y'){
|
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/huge/MsgHGDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/huge/MsgHGDataSMLView.jsp
... | ... | @@ -3102,10 +3102,10 @@ |
| 3102 | 3102 |
var callFrom = $("#callFromList option:selected").val();
|
| 3103 | 3103 |
|
| 3104 | 3104 |
var advStr = '<div class="ad_txt"><p>(선거운동정보)</p></div>'; |
| 3105 |
- var advDenyStr = '<div class="deny_txt">후보자전화번호 ' + callFrom + '<br/>불법수집정보 신고번호 118번<br/>무료거부 0808800858</div>'; |
|
| 3105 |
+ var advDenyStr = '<div class="deny_txt">후보자전화번호 ' + callFrom + '<br/>불법수집정보 신고번호 : 선거관리위원회 ☎1390<br/>무료거부 0808800858</div>'; |
|
| 3106 | 3106 |
|
| 3107 | 3107 |
var preAdvStr = '<p class="ad_tit">(선거운동정보)</p>'; |
| 3108 |
- var preAdvDenyStr = '<p class="deny_receipt">후보자전화번호 ' + callFrom + '<br>불법수집정보 신고번호 118번<br>무료거부 0808800858</p>'; |
|
| 3108 |
+ var preAdvDenyStr = '<p class="deny_receipt">후보자전화번호 ' + callFrom + '<br>불법수집정보 신고번호 : 선거관리위원회 ☎1390<br>무료거부 0808800858</p>'; |
|
| 3109 | 3109 |
|
| 3110 | 3110 |
//광고 및 무료수신거부 텍스트 추가 |
| 3111 | 3111 |
if ($('input[name=send_adYn]:checked').val() == 'Y'){
|
--- src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp
... | ... | @@ -3365,10 +3365,10 @@ |
| 3365 | 3365 |
var callFrom = $("#callFromList option:selected").val();
|
| 3366 | 3366 |
|
| 3367 | 3367 |
var advStr = '<div class="ad_txt"><p>(선거운동정보)</p></div>'; |
| 3368 |
- var advDenyStr = '<div class="deny_txt">후보자전화번호 ' + callFrom + '<br/>불법수집정보 신고번호 118번<br/>무료거부 0808800858</div>'; |
|
| 3368 |
+ var advDenyStr = '<div class="deny_txt">후보자전화번호 ' + callFrom + '<br/>불법수집정보 신고번호 : 선거관리위원회 ☎1390<br/>무료거부 0808800858</div>'; |
|
| 3369 | 3369 |
|
| 3370 | 3370 |
var preAdvStr = '<p class="ad_tit">(선거운동정보)</p>'; |
| 3371 |
- var preAdvDenyStr = '<p class="deny_receipt">후보자전화번호 ' + callFrom + '<br>불법수집정보 신고번호 118번<br>무료거부 0808800858</p>'; |
|
| 3371 |
+ var preAdvDenyStr = '<p class="deny_receipt">후보자전화번호 ' + callFrom + '<br>불법수집정보 신고번호 : 선거관리위원회 ☎1390<br>무료거부 0808800858</p>'; |
|
| 3372 | 3372 |
|
| 3373 | 3373 |
//광고 및 무료수신거부 텍스트 추가 |
| 3374 | 3374 |
if (!advMsgSts){//선거문자 필수문구 추가해주기
|
--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
... | ... | @@ -198,7 +198,8 @@ |
| 198 | 198 |
</c:if> |
| 199 | 199 |
<tr> |
| 200 | 200 |
<td> |
| 201 |
- <fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.reqdate}" />
|
|
| 201 |
+<%-- <fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.reqDate}" /> --%>
|
|
| 202 |
+ <c:out value="${result.reqDate}" />
|
|
| 202 | 203 |
</td> |
| 203 | 204 |
<td> |
| 204 | 205 |
<c:choose> |
--- src/main/webapp/publish/css/popupLayer.css
+++ src/main/webapp/publish/css/popupLayer.css
... | ... | @@ -296,7 +296,7 @@ |
| 296 | 296 |
.histroy_trans ul {background-color: #f5f5f5; padding: 0 20px; border: 1px solid #dadada; border-radius: 0 0 5px 5px; margin-top: -3px;}
|
| 297 | 297 |
.histroy_trans ul li {position: relative; height: 30px; line-height: 30px; border-bottom: 1px solid #e8e8e8;}
|
| 298 | 298 |
.histroy_trans ul li:only-child {border-bottom: 0;}
|
| 299 |
-.histroy_trans ul li p {display: inline-block; width: 100%; color: #666; font-size: 14px; font-weight: 300; letter-spacing: 0.5px; text-align:center;}
|
|
| 299 |
+.histroy_trans ul li p {display: inline-block; color: #666; font-size: 14px; font-weight: 300; letter-spacing: 0.5px; text-align:center;}
|
|
| 300 | 300 |
.histroy_trans ul li button {position: absolute; right: 0; top: 50%; transform: translateY(-50%);}
|
| 301 | 301 |
.popup_btn_wrap2.hisroy_btn {width: 178px;}
|
| 302 | 302 |
.popup_btn_wrap2.hisroy_btn button {width: calc(100%/2 - 2.5px); height: 32px; font-size: 14px;}
|
+++ src/main/webapp/publish/maintenance.html
... | ... | @@ -0,0 +1,31 @@ |
| 1 | +<!DOCTYPE html> | |
| 2 | +<html lang="ko"> | |
| 3 | + | |
| 4 | +<head> | |
| 5 | + <meta charset="UTF-8"> | |
| 6 | + <title>문자온 시스템 점검 안내</title> | |
| 7 | + | |
| 8 | + <style> | |
| 9 | + body {background-color: #EEE;display:flex; justify-content: center; font-family: 'Noto Sans KR', sans-serif; } | |
| 10 | + .textbox {margin:100px 0 0 0; width:480px; border:15px solid #d8d8d8; padding:25px 40px 50px 40px; background-color: #fff;} | |
| 11 | + .textbox h1 {color:#222; font-size:24px; text-align: center; border-bottom:1px solid #a8a8a8; padding:0 0 20px 0; font-weight: 600;} | |
| 12 | + .textbox h3 {color:#333; font-size:16px; font-weight: 400; text-align: center; padding: 12px 0 14px 0; background-color: #f8f8f8; margin:20px 0 20px 0; border:1px solid #ededed; } | |
| 13 | + .textbox h3 strong {font-size:17px; font-weight:500px;} | |
| 14 | + .textbox p {text-align: center; margin: 8px 0 0 0; font-size:16px; font-weight: 400; color:#555; line-height: 26px; } | |
| 15 | + .textbox p span {color:#333;font-weight: 500; } | |
| 16 | + </style> | |
| 17 | +</head> | |
| 18 | + | |
| 19 | +<body> | |
| 20 | + <div class="textbox"> | |
| 21 | + <h1>문자온 시스템 점검중입니다.</h1> | |
| 22 | + <h3>· 점검일시 : <strong>2025년 4월 28일(월) 08:30 ~ 08:35</strong> (약 5분간)</h3> | |
| 23 | + <p>현재 홈페이지 인증서 교체 작업을 위한 시스템 점검중에 있습니다.</p> | |
| 24 | + <p><span>(기)예약 설정 건은 정상 발송되며, <br>작업 이전 '발송대기'건은 작업 완료 후 발송 시도됩니다.</span></p> | |
| 25 | + <p>항상 더 나은 서비스 제공을 위해 노력하겠습니다.<br> | |
| 26 | + 감사합니다.</p> | |
| 27 | + </div> | |
| 28 | + | |
| 29 | +</body> | |
| 30 | + | |
| 31 | +</html>(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?