Merge branch 'master_tolag3'
This commit is contained in:
commit
04dc4c5d34
@ -242,7 +242,7 @@ public class KakaoSentServiceImpl extends EgovAbstractServiceImpl implements Ka
|
||||
int failed = 0; // 실패 건수
|
||||
if("Y".equals(resultVO.getBizKakaoResendYn())) {
|
||||
success = resultVO.getSuccessCount() + resultVO.getKakaoResendSuccCount();
|
||||
failed = resultVO.getKakaoResendFailCount();
|
||||
failed = resultVO.getFailCount() - resultVO.getKakaoResendSuccCount();
|
||||
}else {
|
||||
success = resultVO.getSuccessCount();
|
||||
failed = resultVO.getFailCount();
|
||||
@ -254,8 +254,8 @@ public class KakaoSentServiceImpl extends EgovAbstractServiceImpl implements Ka
|
||||
String failedPct = total > 0 ? String.format("%.1f%%", (failed / (double) total) * 100) : "0.0%";
|
||||
|
||||
resultVO.setSuccessPct(successPct);
|
||||
resultVO.setFailedPct(waitingPct);
|
||||
resultVO.setWaitingPct(failedPct);
|
||||
resultVO.setFailedPct(failedPct);
|
||||
resultVO.setWaitingPct(waitingPct);
|
||||
|
||||
resultVO.setTotPrice(this.priceProc(resultVO.getSuccessPrice(), resultVO.getKakaoResendSuccPrice()));
|
||||
|
||||
|
||||
@ -1679,37 +1679,55 @@
|
||||
SUM(IF(t1.RESERVE_C_YN = 'N' AND t1.RSLT_CODE = '7000', 1, 0)) AS successCount,
|
||||
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,
|
||||
SUM(IF(t1.RESERVE_C_YN = 'N' AND t1.RSLT_CODE != '7000' AND t1.RSLT_CODE IS NOT NULL, 1, 0)) AS failCount,
|
||||
SUM(IF(t1.BIZ_KAKAO_RESEND_YN = 'Y' AND BL1.CALL_STATUS IN ('6600', '4100'), 1, 0)) AS kakaoResendSuccCount,
|
||||
SUM(IF(
|
||||
t1.BIZ_KAKAO_RESEND_YN = 'Y' AND
|
||||
NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM (
|
||||
SELECT '6600' AS status UNION ALL SELECT '4100'
|
||||
) AS status_list
|
||||
WHERE status_list.status = BL1.CALL_STATUS
|
||||
), 1, 0
|
||||
)) AS kakaoResendFailCount,
|
||||
SUM(IF(
|
||||
t1.BIZ_KAKAO_RESEND_YN = 'Y' AND
|
||||
NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM (
|
||||
SELECT '6600' AS status UNION ALL SELECT '4100'
|
||||
) AS status_list
|
||||
WHERE status_list.status = BL1.CALL_STATUS
|
||||
) AND t1.BIZ_KAKAO_RESEND_TYPE = 'SMS', 1, 0
|
||||
)) AS smsCnt,
|
||||
SUM(IF(
|
||||
t1.BIZ_KAKAO_RESEND_YN = 'Y' AND
|
||||
NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM (
|
||||
SELECT '6600' AS status UNION ALL SELECT '4100'
|
||||
) AS status_list
|
||||
WHERE status_list.status = BL1.CALL_STATUS
|
||||
) AND t1.BIZ_KAKAO_RESEND_TYPE = 'MMS', 1, 0
|
||||
)) AS mmsCnt,
|
||||
SUM(IF(t1.BIZ_KAKAO_RESEND_YN = 'Y'
|
||||
AND BL1.CALL_STATUS IN ('6600', '4100'), 1, 0)) AS kakaoResendSuccCount,
|
||||
( SELECT COUNT(0)
|
||||
FROM BIZ_LOG BL1,
|
||||
MJ_MSG_DATA MMD1
|
||||
WHERE t1.BIZ_KAKAO_RESEND_YN = 'Y'
|
||||
AND t1.MSG_GROUP_ID = MMD1.MSG_GROUP_ID
|
||||
AND MMD1.BIZ_UMID = BL1.CMID
|
||||
AND (
|
||||
CASE
|
||||
WHEN BL1.CALL_STATUS IN ('6600',
|
||||
'4100')
|
||||
THEN 'S'
|
||||
ELSE 'F'
|
||||
END ) = 'F'
|
||||
)
|
||||
kakaoResendFailCount,
|
||||
( SELECT COUNT(0)
|
||||
FROM BIZ_LOG BL1,
|
||||
MJ_MSG_DATA MMD1
|
||||
WHERE t1.BIZ_KAKAO_RESEND_YN = 'Y'
|
||||
AND t1.MSG_GROUP_ID = MMD1.MSG_GROUP_ID
|
||||
AND MMD1.BIZ_UMID = BL1.CMID
|
||||
AND (
|
||||
CASE
|
||||
WHEN BL1.CALL_STATUS IN ('6600',
|
||||
'4100')
|
||||
THEN 'S'
|
||||
ELSE 'F'
|
||||
END ) = 'S'
|
||||
AND MMD1.BIZ_KAKAO_RESEND_TYPE = 'SMS'
|
||||
)
|
||||
smsCnt,
|
||||
( SELECT COUNT(0)
|
||||
FROM BIZ_LOG BL1,
|
||||
MJ_MSG_DATA MMD1
|
||||
WHERE t1.BIZ_KAKAO_RESEND_YN = 'Y'
|
||||
AND t1.MSG_GROUP_ID = MMD1.MSG_GROUP_ID
|
||||
AND MMD1.BIZ_UMID = BL1.CMID
|
||||
AND (
|
||||
CASE
|
||||
WHEN BL1.CALL_STATUS IN ('6600',
|
||||
'4100')
|
||||
THEN 'S'
|
||||
ELSE 'F'
|
||||
END ) = 'S'
|
||||
AND MMD1.BIZ_KAKAO_RESEND_TYPE = 'MMS'
|
||||
)
|
||||
mmsCnt,
|
||||
CASE
|
||||
WHEN COUNT(DISTINCT t1.REQ_DATE) > 1 THEN 'Y'
|
||||
ELSE 'N'
|
||||
|
||||
@ -400,6 +400,7 @@
|
||||
WHEN A.AGENT_CODE = '02' AND (A.RSLT_CODE = '0') then '성공'
|
||||
WHEN A.AGENT_CODE = '03' AND (A.RSLT_CODE in ('100', '101', '110', '800')) then '성공'
|
||||
WHEN A.AGENT_CODE = '04' AND (A.RSLT_CODE in ('4100', '6600', '7000')) then '성공'
|
||||
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 '성공(대체문자)'
|
||||
WHEN A.AGENT_CODE = '05' AND (A.RSLT_CODE in ('1000', '1001')) then '성공'
|
||||
WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE in ('6', '1000')) then '성공'
|
||||
WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE in ('1000', '1001')) then '성공'
|
||||
@ -409,6 +410,7 @@
|
||||
END as statusTxt
|
||||
from
|
||||
MJ_MSG_DATA A
|
||||
LEFT OUTER JOIN BIZ_LOG BL1 ON A.BIZ_UMID = BL1.CMID
|
||||
where
|
||||
A.MSG_GROUP_ID = #msgGroupId#
|
||||
|
||||
|
||||
@ -104,16 +104,23 @@ function fnReservCancel(msgGroupId){
|
||||
|
||||
}
|
||||
|
||||
function pageUnitChg(obj){
|
||||
document.searchForm.pageUnit.value = obj.value;
|
||||
linkPage(1);
|
||||
}
|
||||
|
||||
</script>
|
||||
<div class="list_info">
|
||||
<p>총 발송건수 <span class="c_e40000"><c:out value="${totalRecordCount}"/></span>건</p>
|
||||
<div>
|
||||
<p class="cf_text c_e40000">※ 예약 발송취소는 예약 발송시간 기준 5분 전까지만 가능</p>
|
||||
<label for="pageUnit" class="label">줄보기 선택</label>
|
||||
<select id="pageUnit" name="pageUnit" class="selType2">
|
||||
<!-- <select id="pageUnit" name="pageUnit" class="selType2"> -->
|
||||
<select class="selType2" onchange="pageUnitChg(this);">
|
||||
<option value="10" <c:if test="${paginationInfo.recordCountPerPage == '10'}">selected</c:if> >10개보기</option>
|
||||
<option value="20" <c:if test="${paginationInfo.recordCountPerPage == '20'}">selected</c:if> >20개보기</option>
|
||||
<option value="30" <c:if test="${paginationInfo.recordCountPerPage == '30'}">selected</c:if> >30개보기</option>
|
||||
<option value="100" <c:if test="${paginationInfo.recordCountPerPage == '100'}">selected</c:if> >30개보기</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -659,7 +659,7 @@ function previewPhone(){
|
||||
<c:if test="${result.reserveYn eq 'Y' }">
|
||||
<dl><!-- 예약 시 -->
|
||||
<dt>등록일시</dt>
|
||||
<dd>${result.regDate}</dd>
|
||||
<dd><fmt:formatDate pattern = "yyyy-MM-dd HH:mm:ss" value = "${result.regdate}" /></dd>
|
||||
</dl>
|
||||
</c:if>
|
||||
<dl>
|
||||
@ -760,7 +760,7 @@ function previewPhone(){
|
||||
<div class="res_info_btm1">
|
||||
<dl>
|
||||
<dt>성공건수</dt>
|
||||
<dd><span class="c_002c9a_g"><fmt:formatNumber value="${result.successCount}" type="number" groupingUsed="true" /></span>건(${result.successPct})</dd>
|
||||
<dd><span class="c_002c9a_g"><fmt:formatNumber value="${result.successCount + result.kakaoResendSuccCount}" type="number" groupingUsed="true" /></span>건(${result.successPct})</dd>
|
||||
</dl>
|
||||
</div>
|
||||
</div>
|
||||
@ -774,7 +774,12 @@ function previewPhone(){
|
||||
<div class="res_info_btm1">
|
||||
<dl>
|
||||
<dt>실패건수</dt>
|
||||
<dd><span class="c_e40000_g"><fmt:formatNumber value="${result.failCount}" type="number" groupingUsed="true" /></span>건(${result.failedPct})</dd>
|
||||
<%-- 대체문자 기능 on
|
||||
카카오톡 실패 + 대체문자 실패 = 실패
|
||||
대체문자 기능 off
|
||||
카카오톡 실패 = 실패
|
||||
*카카오톡 실패임에도 대체문자로 발송이 성공한 경우 실패로 체크하지 않음 --%>
|
||||
<dd><span class="c_e40000_g"><fmt:formatNumber value="${result.failCount - result.kakaoResendSuccCount}" type="number" groupingUsed="true" /></span>건(${result.failedPct})</dd>
|
||||
</dl>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@ -156,11 +156,11 @@ $(document).ready(function(){
|
||||
|
||||
});
|
||||
|
||||
$(document).on('change','#pageUnit', function(){
|
||||
/* $(document).on('change','#pageUnit', function(){
|
||||
|
||||
linkPage(1);
|
||||
|
||||
});
|
||||
}); */
|
||||
|
||||
//발송건수 셋
|
||||
cntSet();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user