--- src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java
+++ src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java
... | ... | @@ -110,8 +110,8 @@ |
| 110 | 110 |
|
| 111 | 111 |
private String statusCd; |
| 112 | 112 |
|
| 113 |
- private int successPrice; |
|
| 114 |
- private int kakaoResendSuccPrice; |
|
| 113 |
+ private String successPrice; |
|
| 114 |
+ private String kakaoResendSuccPrice; |
|
| 115 | 115 |
|
| 116 | 116 |
private String divideYn; |
| 117 | 117 |
|
--- src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java
+++ src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java
... | ... | @@ -299,7 +299,7 @@ |
| 299 | 299 |
|
| 300 | 300 |
} |
| 301 | 301 |
|
| 302 |
- private String priceProc(int successPrice, int kakaoResendSuccPrice) {
|
|
| 302 |
+ private String priceProc(String successPrice, String kakaoResendSuccPrice) {
|
|
| 303 | 303 |
|
| 304 | 304 |
String totPrice = "-"; |
| 305 | 305 |
|
... | ... | @@ -311,7 +311,8 @@ |
| 311 | 311 |
BigDecimal totalPrice = atPrice.add(kakaoResendPrice); |
| 312 | 312 |
// 소수점 한 자리로 설정 (반올림)// totalPrice 값을 소수점 한 자리까지 반올림하여 roundedTotalPrice에 저장 |
| 313 | 313 |
// RoundingMode.HALF_UP: 반올림 방식으로, 소수점 기준 5 이상이면 올림, 그렇지 않으면 내림 |
| 314 |
- BigDecimal roundedTotalPrice = totalPrice.setScale(1, RoundingMode.HALF_UP); |
|
| 314 |
+// BigDecimal roundedTotalPrice = totalPrice.setScale(1, RoundingMode.HALF_UP); |
|
| 315 |
+ BigDecimal roundedTotalPrice = totalPrice; |
|
| 315 | 316 |
|
| 316 | 317 |
// roundedTotalPrice가 0인지 확인 |
| 317 | 318 |
// BigDecimal.compareTo(BigDecimal.ZERO)는 값을 비교하는 메서드 |
--- src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml
... | ... | @@ -1458,6 +1458,11 @@ |
| 1458 | 1458 |
AND B.RESERVE_YN = 'N' |
| 1459 | 1459 |
</isEqual> |
| 1460 | 1460 |
</isNotEmpty> |
| 1461 |
+ <isNotEmpty property="searchKeyword"> |
|
| 1462 |
+ <isEqual property="searchCondition" compareValue="3"> |
|
| 1463 |
+ AND B.SMS_TXT like CONCAT('%', #searchKeyword#, '%')
|
|
| 1464 |
+ </isEqual> |
|
| 1465 |
+ </isNotEmpty> |
|
| 1461 | 1466 |
GROUP BY B.MSG_GROUP_ID |
| 1462 | 1467 |
ORDER BY 1=1 |
| 1463 | 1468 |
<isNotEmpty property="searchSortCnd"> |
... | ... | @@ -1547,126 +1552,67 @@ |
| 1547 | 1552 |
</select> |
| 1548 | 1553 |
|
| 1549 | 1554 |
<select id="KakaoSentDAO.selectKakaoSentCntEachCnt_advc" parameterClass="kakaoSentVO" resultClass="kakaoSentVO"> |
| 1550 |
- SELECT a.MSG_GROUP_ID AS msgGroupId, |
|
| 1551 |
- a.successCount, |
|
| 1552 |
- a.waitCount, |
|
| 1553 |
- a.failCount, |
|
| 1554 |
- a.kakaoResendSuccCount, |
|
| 1555 |
- a.kakaoResendFailCount, |
|
| 1556 |
- a.successCount * bkp.BIZ_KAKAO_AT_PRICE AS successPrice, |
|
| 1557 |
- (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE) AS kakaoResendSuccPrice, |
|
| 1558 |
- a.divideYn |
|
| 1559 |
- FROM (SELECT t1.MSG_GROUP_ID, |
|
| 1560 |
- ( SELECT COUNT(0) |
|
| 1561 |
- FROM MJ_MSG_DATA C |
|
| 1562 |
- WHERE C.RESERVE_C_YN = 'N' |
|
| 1563 |
- AND C.MSG_GROUP_ID = t1.MSG_GROUP_ID |
|
| 1564 |
- AND C.RSLT_CODE = '7000' |
|
| 1565 |
- ) |
|
| 1566 |
- AS successCount , |
|
| 1567 |
- ( SELECT COUNT(0) |
|
| 1568 |
- FROM MJ_MSG_DATA C |
|
| 1569 |
- WHERE C.RESERVE_C_YN = 'N' |
|
| 1570 |
- AND C.MSG_GROUP_ID = t1.MSG_GROUP_ID |
|
| 1571 |
- AND |
|
| 1572 |
- ( |
|
| 1573 |
- C.RSLT_CODE IS NULL |
|
| 1574 |
- AND C.SENT_DATE IS NULL |
|
| 1575 |
- AND C.RSLT_DATE IS NULL |
|
| 1576 |
- ) |
|
| 1577 |
- ) |
|
| 1578 |
- AS waitCount , |
|
| 1579 |
- ( SELECT COUNT(0) |
|
| 1580 |
- FROM MJ_MSG_DATA C |
|
| 1581 |
- WHERE C.RESERVE_C_YN = 'N' |
|
| 1582 |
- AND C.MSG_GROUP_ID = t1.MSG_GROUP_ID |
|
| 1583 |
- AND |
|
| 1584 |
- ( |
|
| 1585 |
- C.RSLT_CODE != '7000' |
|
| 1586 |
- AND C.RSLT_CODE IS NOT NULL |
|
| 1587 |
- ) |
|
| 1588 |
- ) |
|
| 1589 |
- AS failCount , |
|
| 1590 |
- ( SELECT COUNT(0) |
|
| 1591 |
- FROM BIZ_LOG BL1, |
|
| 1592 |
- MJ_MSG_DATA MMD1 |
|
| 1593 |
- WHERE t1.BIZ_KAKAO_RESEND_YN = 'Y' |
|
| 1594 |
- AND t1.MSG_GROUP_ID = MMD1.MSG_GROUP_ID |
|
| 1595 |
- AND MMD1.BIZ_UMID = BL1.CMID |
|
| 1596 |
- AND ( |
|
| 1597 |
- CASE |
|
| 1598 |
- WHEN BL1.CALL_STATUS IN ('6600',
|
|
| 1599 |
- '4100') |
|
| 1600 |
- THEN 'S' |
|
| 1601 |
- ELSE 'F' |
|
| 1602 |
- END ) = 'S' |
|
| 1603 |
- ) |
|
| 1604 |
- kakaoResendSuccCount, |
|
| 1605 |
- ( SELECT COUNT(0) |
|
| 1606 |
- FROM BIZ_LOG BL1, |
|
| 1607 |
- MJ_MSG_DATA MMD1 |
|
| 1608 |
- WHERE t1.BIZ_KAKAO_RESEND_YN = 'Y' |
|
| 1609 |
- AND t1.MSG_GROUP_ID = MMD1.MSG_GROUP_ID |
|
| 1610 |
- AND MMD1.BIZ_UMID = BL1.CMID |
|
| 1611 |
- AND ( |
|
| 1612 |
- CASE |
|
| 1613 |
- WHEN BL1.CALL_STATUS IN ('6600',
|
|
| 1614 |
- '4100') |
|
| 1615 |
- THEN 'S' |
|
| 1616 |
- ELSE 'F' |
|
| 1617 |
- END ) = 'F' |
|
| 1618 |
- ) |
|
| 1619 |
- kakaoResendFailCount, |
|
| 1620 |
- ( SELECT COUNT(0) |
|
| 1621 |
- FROM BIZ_LOG BL1, |
|
| 1622 |
- MJ_MSG_DATA MMD1 |
|
| 1623 |
- WHERE t1.BIZ_KAKAO_RESEND_YN = 'Y' |
|
| 1624 |
- AND t1.MSG_GROUP_ID = MMD1.MSG_GROUP_ID |
|
| 1625 |
- AND MMD1.BIZ_UMID = BL1.CMID |
|
| 1626 |
- AND ( |
|
| 1627 |
- CASE |
|
| 1628 |
- WHEN BL1.CALL_STATUS IN ('6600',
|
|
| 1629 |
- '4100') |
|
| 1630 |
- THEN 'S' |
|
| 1631 |
- ELSE 'F' |
|
| 1632 |
- END ) = 'S' |
|
| 1633 |
- AND MMD1.BIZ_KAKAO_RESEND_TYPE = 'SMS' |
|
| 1634 |
- ) |
|
| 1635 |
- smsCnt, |
|
| 1636 |
- ( SELECT COUNT(0) |
|
| 1637 |
- FROM BIZ_LOG BL1, |
|
| 1638 |
- MJ_MSG_DATA MMD1 |
|
| 1639 |
- WHERE t1.BIZ_KAKAO_RESEND_YN = 'Y' |
|
| 1640 |
- AND t1.MSG_GROUP_ID = MMD1.MSG_GROUP_ID |
|
| 1641 |
- AND MMD1.BIZ_UMID = BL1.CMID |
|
| 1642 |
- AND ( |
|
| 1643 |
- CASE |
|
| 1644 |
- WHEN BL1.CALL_STATUS IN ('6600',
|
|
| 1645 |
- '4100') |
|
| 1646 |
- THEN 'S' |
|
| 1647 |
- ELSE 'F' |
|
| 1648 |
- END ) = 'S' |
|
| 1649 |
- AND MMD1.BIZ_KAKAO_RESEND_TYPE = 'MMS' |
|
| 1650 |
- ) |
|
| 1651 |
- mmsCnt, |
|
| 1652 |
- CASE |
|
| 1653 |
- WHEN COUNT(DISTINCT t1.REQ_DATE) > 1 THEN 'Y' |
|
| 1654 |
- ELSE 'N' |
|
| 1655 |
- END AS divideYN |
|
| 1656 |
- FROM mj_msg_data t1 |
|
| 1657 |
- WHERE t1.DEL_FLAG = 'N' |
|
| 1658 |
- AND t1.MSG_TYPE IN ('8',
|
|
| 1659 |
- '9') |
|
| 1660 |
- AND t1.CUR_STATE IN ('0',
|
|
| 1661 |
- '1', |
|
| 1662 |
- '2', |
|
| 1663 |
- '3') |
|
| 1664 |
- AND t1.MSG_GROUP_ID = #msgGroupId# |
|
| 1665 |
- GROUP BY t1.MSG_GROUP_ID |
|
| 1666 |
- ) |
|
| 1667 |
- a |
|
| 1668 |
- LEFT OUTER JOIN BIZ_KAKAO_PRICE bkp |
|
| 1669 |
- ON bkp.MSG_GROUP_ID = a.MSG_GROUP_ID |
|
| 1555 |
+ SELECT |
|
| 1556 |
+ a.MSG_GROUP_ID AS msgGroupId, |
|
| 1557 |
+ a.successCount, |
|
| 1558 |
+ a.waitCount, |
|
| 1559 |
+ a.failCount, |
|
| 1560 |
+ a.kakaoResendSuccCount, |
|
| 1561 |
+ a.kakaoResendFailCount, |
|
| 1562 |
+ a.successCount * bkp.BIZ_KAKAO_AT_PRICE AS successPrice, |
|
| 1563 |
+ (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE) AS kakaoResendSuccPrice, |
|
| 1564 |
+ a.divideYn |
|
| 1565 |
+ FROM ( |
|
| 1566 |
+ SELECT |
|
| 1567 |
+ t1.MSG_GROUP_ID, |
|
| 1568 |
+ SUM(IF(t1.RESERVE_C_YN = 'N' AND t1.RSLT_CODE = '7000', 1, 0)) AS successCount, |
|
| 1569 |
+ 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, |
|
| 1570 |
+ SUM(IF(t1.RESERVE_C_YN = 'N' AND t1.RSLT_CODE != '7000' AND t1.RSLT_CODE IS NOT NULL, 1, 0)) AS failCount, |
|
| 1571 |
+ SUM(IF(t1.BIZ_KAKAO_RESEND_YN = 'Y' AND BL1.CALL_STATUS IN ('6600', '4100'), 1, 0)) AS kakaoResendSuccCount,
|
|
| 1572 |
+ SUM(IF( |
|
| 1573 |
+ t1.BIZ_KAKAO_RESEND_YN = 'Y' AND |
|
| 1574 |
+ NOT EXISTS ( |
|
| 1575 |
+ SELECT 1 |
|
| 1576 |
+ FROM ( |
|
| 1577 |
+ SELECT '6600' AS status UNION ALL SELECT '4100' |
|
| 1578 |
+ ) AS status_list |
|
| 1579 |
+ WHERE status_list.status = BL1.CALL_STATUS |
|
| 1580 |
+ ), 1, 0 |
|
| 1581 |
+ )) AS kakaoResendFailCount, |
|
| 1582 |
+ SUM(IF( |
|
| 1583 |
+ t1.BIZ_KAKAO_RESEND_YN = 'Y' AND |
|
| 1584 |
+ NOT EXISTS ( |
|
| 1585 |
+ SELECT 1 |
|
| 1586 |
+ FROM ( |
|
| 1587 |
+ SELECT '6600' AS status UNION ALL SELECT '4100' |
|
| 1588 |
+ ) AS status_list |
|
| 1589 |
+ WHERE status_list.status = BL1.CALL_STATUS |
|
| 1590 |
+ ) AND t1.BIZ_KAKAO_RESEND_TYPE = 'SMS', 1, 0 |
|
| 1591 |
+ )) AS smsCnt, |
|
| 1592 |
+ SUM(IF( |
|
| 1593 |
+ t1.BIZ_KAKAO_RESEND_YN = 'Y' AND |
|
| 1594 |
+ NOT EXISTS ( |
|
| 1595 |
+ SELECT 1 |
|
| 1596 |
+ FROM ( |
|
| 1597 |
+ SELECT '6600' AS status UNION ALL SELECT '4100' |
|
| 1598 |
+ ) AS status_list |
|
| 1599 |
+ WHERE status_list.status = BL1.CALL_STATUS |
|
| 1600 |
+ ) AND t1.BIZ_KAKAO_RESEND_TYPE = 'MMS', 1, 0 |
|
| 1601 |
+ )) AS mmsCnt, |
|
| 1602 |
+ CASE |
|
| 1603 |
+ WHEN COUNT(DISTINCT t1.REQ_DATE) > 1 THEN 'Y' |
|
| 1604 |
+ ELSE 'N' |
|
| 1605 |
+ END AS divideYN |
|
| 1606 |
+ FROM mj_msg_data t1 |
|
| 1607 |
+ LEFT OUTER JOIN BIZ_LOG BL1 ON t1.BIZ_UMID = BL1.CMID |
|
| 1608 |
+ WHERE |
|
| 1609 |
+ t1.DEL_FLAG = 'N' |
|
| 1610 |
+ AND t1.MSG_TYPE IN ('8', '9')
|
|
| 1611 |
+ AND t1.CUR_STATE IN ('0', '1', '2', '3')
|
|
| 1612 |
+ AND t1.MSG_GROUP_ID = #msgGroupId# |
|
| 1613 |
+ GROUP BY t1.MSG_GROUP_ID |
|
| 1614 |
+ ) a |
|
| 1615 |
+ LEFT OUTER JOIN BIZ_KAKAO_PRICE bkp ON bkp.MSG_GROUP_ID = a.MSG_GROUP_ID |
|
| 1670 | 1616 |
</select> |
| 1671 | 1617 |
|
| 1672 | 1618 |
<!-- 알림톡 발송결과 상세 데이터--> |
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp
... | ... | @@ -228,7 +228,8 @@ |
| 228 | 228 |
</div> |
| 229 | 229 |
</td> |
| 230 | 230 |
<td> |
| 231 |
- <c:out value="${resultAllSentList.msgGroupCnt}"/>
|
|
| 231 |
+ <fmt:formatNumber value="${resultAllSentList.msgGroupCnt}" type="number" groupingUsed="true" />
|
|
| 232 |
+<%-- <c:out value="${resultAllSentList.msgGroupCnt}"/> --%>
|
|
| 232 | 233 |
</td> |
| 233 | 234 |
<td> |
| 234 | 235 |
<fmt:formatNumber value="${resultAllSentList.waitCount}" type="number" groupingUsed="true" />
|
--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp
... | ... | @@ -203,14 +203,15 @@ |
| 203 | 203 |
|
| 204 | 204 |
function fnSearch(pageNo){
|
| 205 | 205 |
|
| 206 |
- var form = document.searchForm; |
|
| 206 |
+// var form = document.searchForm; |
|
| 207 | 207 |
|
| 208 |
- form.pageIndex.value = pageNo ; |
|
| 208 |
+// form.pageIndex.value = pageNo ; |
|
| 209 | 209 |
|
| 210 | 210 |
|
| 211 |
- form.action="/web/kakao/sent/selectKakaoSentView.do"; |
|
| 212 |
- form.submit(); |
|
| 213 |
- |
|
| 211 |
+// form.action="/web/kakao/sent/selectKakaoSentView.do"; |
|
| 212 |
+// form.submit(); |
|
| 213 |
+ cntSet(); |
|
| 214 |
+ linkPage(pageNo); |
|
| 214 | 215 |
} |
| 215 | 216 |
|
| 216 | 217 |
function fnExcelDownLoad(pageType, listType){
|
... | ... | @@ -467,9 +468,9 @@ |
| 467 | 468 |
<div class="btn_right"> |
| 468 | 469 |
<label for="searchCondition" class="label">발신번호 선택 == ${kakaoSentVO.searchCondition}</label>
|
| 469 | 470 |
<select name="searchCondition" id="searchCondition" class="selType2"> |
| 470 |
- <option value="4" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >채널ID</option>
|
|
| 471 |
- <option value="5" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >내용</option>
|
|
| 472 |
- <option value="3" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >수신번호</option>
|
|
| 471 |
+<%-- <option value="4" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >채널ID</option> --%>
|
|
| 472 |
+ <option value="3" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >내용</option>
|
|
| 473 |
+<%-- <option value="3" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >수신번호</option> --%>
|
|
| 473 | 474 |
</select> |
| 474 | 475 |
<div class="search"> |
| 475 | 476 |
<label for="id" class="label"></label> |
... | ... | @@ -613,6 +614,24 @@ |
| 613 | 614 |
<button type="button" onclick="fnListLoad('Y','2'); return false;">예약</button>
|
| 614 | 615 |
</li> |
| 615 | 616 |
</ul> |
| 617 |
+ <!-- 발송화면 개선 : 발송결과 추가--> |
|
| 618 |
+ <div class="tab_btnbox"> |
|
| 619 |
+ <button type="button" class="btnType btnType14 check_validity">발송결과<i class="qmMark"></i></button> |
|
| 620 |
+ <div class="info_hover_cont send_hover_cont price_hover"> |
|
| 621 |
+ <dl> |
|
| 622 |
+ <dt class="c_222">[<span>대기</span>]</dt> |
|
| 623 |
+ <dd>발송은 성공하였으며, 수신자측 통신사로부터 수신여부를 확인중인 상태 <br> |
|
| 624 |
+ <span>※ 예약발송의 경우 실발송 전까지는 “대기”로 표시</span> |
|
| 625 |
+ </dd> |
|
| 626 |
+ <dt class="c_002c9a">[<span>성공</span>]</dt> |
|
| 627 |
+ <dd>발송 및 수신이 완료된 상태</dd> |
|
| 628 |
+ <dt class="c_e40000">[<span>실패</span>]</dt> |
|
| 629 |
+ <dd class="last">결번, 일시정지, 전화번호 오류 등의 사유로 발송이 |
|
| 630 |
+ 불가한 상태</dd> |
|
| 631 |
+ </dl> |
|
| 632 |
+ </div> |
|
| 633 |
+ </div> |
|
| 634 |
+ <!--// 발송화면 개선 : 발송결과 추가--> |
|
| 616 | 635 |
</div> |
| 617 | 636 |
<!-- 발송관리 리스트 --> |
| 618 | 637 |
<div class="table_cont current msgSentAllLoad" id="tableCont_1"> |
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?