--- src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java
+++ src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java
... | ... | @@ -242,7 +242,7 @@ |
| 242 | 242 |
int failed = 0; // 실패 건수 |
| 243 | 243 |
if("Y".equals(resultVO.getBizKakaoResendYn())) {
|
| 244 | 244 |
success = resultVO.getSuccessCount() + resultVO.getKakaoResendSuccCount(); |
| 245 |
- failed = resultVO.getKakaoResendFailCount(); |
|
| 245 |
+ failed = resultVO.getFailCount() - resultVO.getKakaoResendSuccCount(); |
|
| 246 | 246 |
}else {
|
| 247 | 247 |
success = resultVO.getSuccessCount(); |
| 248 | 248 |
failed = resultVO.getFailCount(); |
... | ... | @@ -254,8 +254,8 @@ |
| 254 | 254 |
String failedPct = total > 0 ? String.format("%.1f%%", (failed / (double) total) * 100) : "0.0%";
|
| 255 | 255 |
|
| 256 | 256 |
resultVO.setSuccessPct(successPct); |
| 257 |
- resultVO.setFailedPct(waitingPct); |
|
| 258 |
- resultVO.setWaitingPct(failedPct); |
|
| 257 |
+ resultVO.setFailedPct(failedPct); |
|
| 258 |
+ resultVO.setWaitingPct(waitingPct); |
|
| 259 | 259 |
|
| 260 | 260 |
resultVO.setTotPrice(this.priceProc(resultVO.getSuccessPrice(), resultVO.getKakaoResendSuccPrice())); |
| 261 | 261 |
|
--- src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
... | ... | @@ -1679,37 +1679,55 @@ |
| 1679 | 1679 |
SUM(IF(t1.RESERVE_C_YN = 'N' AND t1.RSLT_CODE = '7000', 1, 0)) AS successCount, |
| 1680 | 1680 |
SUM(IF(t1.RESERVE_C_YN = 'N' AND t1.RSLT_CODE IS NULL AND t1.SENT_DATE IS NULL AND t1.RSLT_DATE IS NULL, 1, 0)) AS waitCount, |
| 1681 | 1681 |
SUM(IF(t1.RESERVE_C_YN = 'N' AND t1.RSLT_CODE != '7000' AND t1.RSLT_CODE IS NOT NULL, 1, 0)) AS failCount, |
| 1682 |
- SUM(IF(t1.BIZ_KAKAO_RESEND_YN = 'Y' AND BL1.CALL_STATUS IN ('6600', '4100'), 1, 0)) AS kakaoResendSuccCount,
|
|
| 1683 |
- SUM(IF( |
|
| 1684 |
- t1.BIZ_KAKAO_RESEND_YN = 'Y' AND |
|
| 1685 |
- NOT EXISTS ( |
|
| 1686 |
- SELECT 1 |
|
| 1687 |
- FROM ( |
|
| 1688 |
- SELECT '6600' AS status UNION ALL SELECT '4100' |
|
| 1689 |
- ) AS status_list |
|
| 1690 |
- WHERE status_list.status = BL1.CALL_STATUS |
|
| 1691 |
- ), 1, 0 |
|
| 1692 |
- )) AS kakaoResendFailCount, |
|
| 1693 |
- SUM(IF( |
|
| 1694 |
- t1.BIZ_KAKAO_RESEND_YN = 'Y' AND |
|
| 1695 |
- NOT EXISTS ( |
|
| 1696 |
- SELECT 1 |
|
| 1697 |
- FROM ( |
|
| 1698 |
- SELECT '6600' AS status UNION ALL SELECT '4100' |
|
| 1699 |
- ) AS status_list |
|
| 1700 |
- WHERE status_list.status = BL1.CALL_STATUS |
|
| 1701 |
- ) AND t1.BIZ_KAKAO_RESEND_TYPE = 'SMS', 1, 0 |
|
| 1702 |
- )) AS smsCnt, |
|
| 1703 |
- SUM(IF( |
|
| 1704 |
- t1.BIZ_KAKAO_RESEND_YN = 'Y' AND |
|
| 1705 |
- NOT EXISTS ( |
|
| 1706 |
- SELECT 1 |
|
| 1707 |
- FROM ( |
|
| 1708 |
- SELECT '6600' AS status UNION ALL SELECT '4100' |
|
| 1709 |
- ) AS status_list |
|
| 1710 |
- WHERE status_list.status = BL1.CALL_STATUS |
|
| 1711 |
- ) AND t1.BIZ_KAKAO_RESEND_TYPE = 'MMS', 1, 0 |
|
| 1712 |
- )) AS mmsCnt, |
|
| 1682 |
+ SUM(IF(t1.BIZ_KAKAO_RESEND_YN = 'Y' |
|
| 1683 |
+ AND BL1.CALL_STATUS IN ('6600', '4100'), 1, 0)) AS kakaoResendSuccCount,
|
|
| 1684 |
+ ( SELECT COUNT(0) |
|
| 1685 |
+ FROM BIZ_LOG BL1, |
|
| 1686 |
+ MJ_MSG_DATA MMD1 |
|
| 1687 |
+ WHERE t1.BIZ_KAKAO_RESEND_YN = 'Y' |
|
| 1688 |
+ AND t1.MSG_GROUP_ID = MMD1.MSG_GROUP_ID |
|
| 1689 |
+ AND MMD1.BIZ_UMID = BL1.CMID |
|
| 1690 |
+ AND ( |
|
| 1691 |
+ CASE |
|
| 1692 |
+ WHEN BL1.CALL_STATUS IN ('6600',
|
|
| 1693 |
+ '4100') |
|
| 1694 |
+ THEN 'S' |
|
| 1695 |
+ ELSE 'F' |
|
| 1696 |
+ END ) = 'F' |
|
| 1697 |
+ ) |
|
| 1698 |
+ kakaoResendFailCount, |
|
| 1699 |
+ ( SELECT COUNT(0) |
|
| 1700 |
+ FROM BIZ_LOG BL1, |
|
| 1701 |
+ MJ_MSG_DATA MMD1 |
|
| 1702 |
+ WHERE t1.BIZ_KAKAO_RESEND_YN = 'Y' |
|
| 1703 |
+ AND t1.MSG_GROUP_ID = MMD1.MSG_GROUP_ID |
|
| 1704 |
+ AND MMD1.BIZ_UMID = BL1.CMID |
|
| 1705 |
+ AND ( |
|
| 1706 |
+ CASE |
|
| 1707 |
+ WHEN BL1.CALL_STATUS IN ('6600',
|
|
| 1708 |
+ '4100') |
|
| 1709 |
+ THEN 'S' |
|
| 1710 |
+ ELSE 'F' |
|
| 1711 |
+ END ) = 'S' |
|
| 1712 |
+ AND MMD1.BIZ_KAKAO_RESEND_TYPE = 'SMS' |
|
| 1713 |
+ ) |
|
| 1714 |
+ smsCnt, |
|
| 1715 |
+ ( SELECT COUNT(0) |
|
| 1716 |
+ FROM BIZ_LOG BL1, |
|
| 1717 |
+ MJ_MSG_DATA MMD1 |
|
| 1718 |
+ WHERE t1.BIZ_KAKAO_RESEND_YN = 'Y' |
|
| 1719 |
+ AND t1.MSG_GROUP_ID = MMD1.MSG_GROUP_ID |
|
| 1720 |
+ AND MMD1.BIZ_UMID = BL1.CMID |
|
| 1721 |
+ AND ( |
|
| 1722 |
+ CASE |
|
| 1723 |
+ WHEN BL1.CALL_STATUS IN ('6600',
|
|
| 1724 |
+ '4100') |
|
| 1725 |
+ THEN 'S' |
|
| 1726 |
+ ELSE 'F' |
|
| 1727 |
+ END ) = 'S' |
|
| 1728 |
+ AND MMD1.BIZ_KAKAO_RESEND_TYPE = 'MMS' |
|
| 1729 |
+ ) |
|
| 1730 |
+ mmsCnt, |
|
| 1713 | 1731 |
CASE |
| 1714 | 1732 |
WHEN COUNT(DISTINCT t1.REQ_DATE) > 1 THEN 'Y' |
| 1715 | 1733 |
ELSE 'N' |
--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
... | ... | @@ -400,6 +400,7 @@ |
| 400 | 400 |
WHEN A.AGENT_CODE = '02' AND (A.RSLT_CODE = '0') then '성공' |
| 401 | 401 |
WHEN A.AGENT_CODE = '03' AND (A.RSLT_CODE in ('100', '101', '110', '800')) then '성공'
|
| 402 | 402 |
WHEN A.AGENT_CODE = '04' AND (A.RSLT_CODE in ('4100', '6600', '7000')) then '성공'
|
| 403 |
+ WHEN A.AGENT_CODE = '04' AND (A.RSLT_CODE not in ('4100', '6600', '7000')) AND A.BIZ_KAKAO_RESEND_YN = 'Y' AND BL1.CALL_STATUS IN ('6600', '4100') then '성공(대체문자)'
|
|
| 403 | 404 |
WHEN A.AGENT_CODE = '05' AND (A.RSLT_CODE in ('1000', '1001')) then '성공'
|
| 404 | 405 |
WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE in ('6', '1000')) then '성공'
|
| 405 | 406 |
WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE in ('1000', '1001')) then '성공'
|
... | ... | @@ -409,6 +410,7 @@ |
| 409 | 410 |
END as statusTxt |
| 410 | 411 |
from |
| 411 | 412 |
MJ_MSG_DATA A |
| 413 |
+ LEFT OUTER JOIN BIZ_LOG BL1 ON A.BIZ_UMID = BL1.CMID |
|
| 412 | 414 |
where |
| 413 | 415 |
A.MSG_GROUP_ID = #msgGroupId# |
| 414 | 416 |
|
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp
... | ... | @@ -104,16 +104,23 @@ |
| 104 | 104 |
|
| 105 | 105 |
} |
| 106 | 106 |
|
| 107 |
+function pageUnitChg(obj){
|
|
| 108 |
+ document.searchForm.pageUnit.value = obj.value; |
|
| 109 |
+ linkPage(1); |
|
| 110 |
+} |
|
| 111 |
+ |
|
| 107 | 112 |
</script> |
| 108 | 113 |
<div class="list_info"> |
| 109 | 114 |
<p>총 발송건수 <span class="c_e40000"><c:out value="${totalRecordCount}"/></span>건</p>
|
| 110 | 115 |
<div> |
| 111 | 116 |
<p class="cf_text c_e40000">※ 예약 발송취소는 예약 발송시간 기준 5분 전까지만 가능</p> |
| 112 | 117 |
<label for="pageUnit" class="label">줄보기 선택</label> |
| 113 |
- <select id="pageUnit" name="pageUnit" class="selType2"> |
|
| 118 |
+ <!-- <select id="pageUnit" name="pageUnit" class="selType2"> --> |
|
| 119 |
+ <select class="selType2" onchange="pageUnitChg(this);"> |
|
| 114 | 120 |
<option value="10" <c:if test="${paginationInfo.recordCountPerPage == '10'}">selected</c:if> >10개보기</option>
|
| 115 | 121 |
<option value="20" <c:if test="${paginationInfo.recordCountPerPage == '20'}">selected</c:if> >20개보기</option>
|
| 116 | 122 |
<option value="30" <c:if test="${paginationInfo.recordCountPerPage == '30'}">selected</c:if> >30개보기</option>
|
| 123 |
+ <option value="100" <c:if test="${paginationInfo.recordCountPerPage == '100'}">selected</c:if> >30개보기</option>
|
|
| 117 | 124 |
</select> |
| 118 | 125 |
</div> |
| 119 | 126 |
</div> |
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp
... | ... | @@ -659,7 +659,7 @@ |
| 659 | 659 |
<c:if test="${result.reserveYn eq 'Y' }">
|
| 660 | 660 |
<dl><!-- 예약 시 --> |
| 661 | 661 |
<dt>등록일시</dt> |
| 662 |
- <dd>${result.regDate}</dd>
|
|
| 662 |
+ <dd><fmt:formatDate pattern = "yyyy-MM-dd HH:mm:ss" value = "${result.regdate}" /></dd>
|
|
| 663 | 663 |
</dl> |
| 664 | 664 |
</c:if> |
| 665 | 665 |
<dl> |
... | ... | @@ -760,7 +760,7 @@ |
| 760 | 760 |
<div class="res_info_btm1"> |
| 761 | 761 |
<dl> |
| 762 | 762 |
<dt>성공건수</dt> |
| 763 |
- <dd><span class="c_002c9a_g"><fmt:formatNumber value="${result.successCount}" type="number" groupingUsed="true" /></span>건(${result.successPct})</dd>
|
|
| 763 |
+ <dd><span class="c_002c9a_g"><fmt:formatNumber value="${result.successCount + result.kakaoResendSuccCount}" type="number" groupingUsed="true" /></span>건(${result.successPct})</dd>
|
|
| 764 | 764 |
</dl> |
| 765 | 765 |
</div> |
| 766 | 766 |
</div> |
... | ... | @@ -774,7 +774,12 @@ |
| 774 | 774 |
<div class="res_info_btm1"> |
| 775 | 775 |
<dl> |
| 776 | 776 |
<dt>실패건수</dt> |
| 777 |
- <dd><span class="c_e40000_g"><fmt:formatNumber value="${result.failCount}" type="number" groupingUsed="true" /></span>건(${result.failedPct})</dd>
|
|
| 777 |
+ <%-- 대체문자 기능 on |
|
| 778 |
+ 카카오톡 실패 + 대체문자 실패 = 실패 |
|
| 779 |
+ 대체문자 기능 off |
|
| 780 |
+ 카카오톡 실패 = 실패 |
|
| 781 |
+ *카카오톡 실패임에도 대체문자로 발송이 성공한 경우 실패로 체크하지 않음 --%> |
|
| 782 |
+ <dd><span class="c_e40000_g"><fmt:formatNumber value="${result.failCount - result.kakaoResendSuccCount}" type="number" groupingUsed="true" /></span>건(${result.failedPct})</dd>
|
|
| 778 | 783 |
</dl> |
| 779 | 784 |
</div> |
| 780 | 785 |
</div> |
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp
... | ... | @@ -156,11 +156,11 @@ |
| 156 | 156 |
|
| 157 | 157 |
}); |
| 158 | 158 |
|
| 159 |
- $(document).on('change','#pageUnit', function(){
|
|
| 159 |
+ /* $(document).on('change','#pageUnit', function(){
|
|
| 160 | 160 |
|
| 161 | 161 |
linkPage(1); |
| 162 | 162 |
|
| 163 |
- }); |
|
| 163 |
+ }); */ |
|
| 164 | 164 |
|
| 165 | 165 |
//발송건수 셋 |
| 166 | 166 |
cntSet(); |
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?