Commit @b1bf60a70691d40f30362ab46c1e9a1cd0505091

myname 2025-05-08

Merge branch 'master' of http://yongjoon.cho@vcs.iten.co.kr:9999/hylee/mjon_git

@b1bf60a70691d40f30362ab46c1e9a1cd0505091

4af623e

b1bf60a

src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java

--- src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java

+++ src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java


 // step3
 // 바이트 수 체크 및 금액설정
 			
-			
-			Float kakaoAtPrice = mberManageVO.getKakaoAtPrice();
+
 			// 유효한 단가 계산
 			float shortPrice = getValidPrice(mberManageVO.getShortPrice(), sysJoinSetVO.getShortPrice());
 			float longPrice = getValidPrice(mberManageVO.getLongPrice(), sysJoinSetVO.getLongPrice());
+			float kakaoAtPrice = getValidPrice(mberManageVO.getKakaoAtPrice(), sysJoinSetVO.getKakaoAtPrice());
 			
 			
 			String shortPStr = Float.toString(shortPrice);
 			String mmsPStr = Float.toString(longPrice);
+			String kakaoAtPStr = Float.toString(kakaoAtPrice);
 			
 			// 공통 가격 설정
 			sendVO.setSmsPrice(shortPStr);
 			sendVO.setMmsPrice(mmsPStr);
+			sendVO.setKakaoAtPrice(kakaoAtPStr);
 			
 			
 			if("Y".equals(kakaoVO.getSubMsgSendYn())) {

 				
 				
 			} else {
-				kakaoAtPrice = getValidPrice(mberManageVO.getKakaoAtPrice(), sysJoinSetVO.getKakaoAtPrice());
-				sendVO.setEachPrice( Float.toString(kakaoAtPrice) );
+				sendVO.setEachPrice(kakaoAtPStr);
 			}
 			
 			

4af623e

b1bf60a

src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java

--- src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java

+++ src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java


 
 /** @biz_kakao_price에 insert (대체문자 환불관련 테이블)*/ 
 				kakaoVO.setMsgGroupId(sendVO.getMsgGroupId());
-				kakaoVO.setKakaoAtPrice(Float.parseFloat(sendVO.getEachPrice()));
+				kakaoVO.setKakaoAtPrice(Float.parseFloat(sendVO.getKakaoAtPrice()));
 				kakaoVO.setSmsPrice(Float.parseFloat(sendVO.getSmsPrice()));
 				kakaoVO.setMmsPrice(Float.parseFloat(sendVO.getMmsPrice()));
 				

4af623e

b1bf60a

src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java

--- src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java

+++ src/main/java/itn/let/kakao/user/sent/service/impl/KakaoSentServiceImpl.java


 		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();

 		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()));
 		

 		//성공 건수 세팅
 		KakaoSentVO eachCnt = new KakaoSentVO();
 		eachCnt.setMsgGroupId(result.getMsgGroupId());
+		eachCnt.setBizKakaoResendYn("Y".equals(result.getBizKakaoResendYn()) ? "Y" : "N");
 		try {
 			eachCnt = kakaoSentDAO.selectKakaoSentCntEachCnt_advc(eachCnt);
 		} catch (Exception e) {

4af623e

b1bf60a

src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/mjo/kakao/KakaoSent_SQL_Mysql.xml


 	
 	<select id="KakaoSentDAO.selectKakaoSentCntEachCnt_advc" parameterClass="kakaoSentVO" resultClass="kakaoSentVO">
 		SELECT 
-		    a.MSG_GROUP_ID AS msgGroupId,
-		    a.successCount,
-		    a.waitCount,
-		    a.failCount,
-		    a.kakaoResendSuccCount,
-		    a.kakaoResendFailCount,
-		    a.successCount * bkp.BIZ_KAKAO_AT_PRICE AS successPrice,
-		    (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE) AS kakaoResendSuccPrice,
-		    a.divideYn
+		    a.MSG_GROUP_ID AS msgGroupId
+		    , a.successCount
+		    , a.waitCount
+		    , a.failCount
+		    , a.divideYn
+		    <isEqual property="bizKakaoResendYn" compareValue="Y">
+			    , a.kakaoResendSuccCount
+			    , a.kakaoResendFailCount
+			    , a.successCount * bkp.BIZ_KAKAO_AT_PRICE AS successPrice
+			    , (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE) AS kakaoResendSuccPrice
+		    </isEqual>
+		    <isNotEqual property="bizKakaoResendYn" compareValue="Y">
+		    	, 0 AS kakaoResendSuccCount
+			    , 0 AS kakaoResendFailCount
+			    , 0 AS successPrice
+			    , 0 AS kakaoResendSuccPrice
+		    </isNotEqual>
 		FROM (
 		    SELECT  
-		        t1.MSG_GROUP_ID,
-		        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,
-		        CASE
-		            WHEN COUNT(DISTINCT t1.REQ_DATE) > 1 THEN 'Y'
-		            ELSE 'N'
-		        END AS divideYN
+		        	 t1.MSG_GROUP_ID
+		             , 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
+		             , CASE
+		                 WHEN COUNT(DISTINCT t1.REQ_DATE) > 1 THEN 'Y'
+		                 ELSE 'N'
+		                 END                                                                                        							    AS divideYN
+		             <isEqual property="bizKakaoResendYn" compareValue="Y">
+			             , 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 BL1.CALL_STATUS not IN ('6600', '4100'), 1,0))         							AS kakaoResendFailCount
+			             , SUM(IF(t1.BIZ_KAKAO_RESEND_YN = 'Y' AND BL1.CALL_STATUS IN ('6600', '4100') AND t1.BIZ_KAKAO_RESEND_TYPE = 'SMS', 1, 0)) AS smsCnt
+			             , SUM(IF(t1.BIZ_KAKAO_RESEND_YN = 'Y' AND BL1.CALL_STATUS IN ('6600', '4100') AND t1.BIZ_KAKAO_RESEND_TYPE = 'MMS', 1, 0)) AS mmsCnt
+		             </isEqual>
 		    FROM mj_msg_data t1 FORCE INDEX (idx_msgdata_groupid_delfalg_msgtype_curstate)
-		    LEFT OUTER JOIN BIZ_LOG BL1 ON t1.BIZ_UMID = BL1.CMID
+		    <isEqual property="bizKakaoResendYn" compareValue="Y">
+		    	LEFT OUTER JOIN BIZ_LOG BL1 ON t1.BIZ_UMID = BL1.CMID
+		    </isEqual>
 		    WHERE 
-		        t1.DEL_FLAG = 'N'
+		        t1.MSG_GROUP_ID = #msgGroupId#
 		        AND t1.MSG_TYPE IN ('8', '9')
 		        AND t1.CUR_STATE IN ('0', '1', '2', '3')
-		        AND t1.MSG_GROUP_ID = #msgGroupId#
+		        AND t1.DEL_FLAG = 'N'
 		    GROUP BY t1.MSG_GROUP_ID
 		) a
 		LEFT OUTER JOIN BIZ_KAKAO_PRICE bkp ON bkp.MSG_GROUP_ID = a.MSG_GROUP_ID

4af623e

b1bf60a

src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml


 				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 '성공'

 			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#
 	

4af623e

b1bf60a

src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentAllListAjax.jsp


 	
 }
 
+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> >100개보기</option>
 			</select>
 		</div>
 	</div>

4af623e

b1bf60a

src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentDetailView.jsp


                                       <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>

 								<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>

 								<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>

4af623e

b1bf60a

src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp


 		
 	});
 	
-	$(document).on('change','#pageUnit', function(){
+	/* $(document).on('change','#pageUnit', function(){
 		
 		linkPage(1);
 		
-	});
+	}); */
 	
 	//발송건수 셋
 	cntSet();

Add a comment

Open 0
Closed 0

List

...	...	@@ -193,19 +193,21 @@
193	193	// step3
194	194	// 바이트 수 체크 및 금액설정
195	195
196		-
197		- Float kakaoAtPrice = mberManageVO.getKakaoAtPrice();
	196	+
198	197	// 유효한 단가 계산
199	198	float shortPrice = getValidPrice(mberManageVO.getShortPrice(), sysJoinSetVO.getShortPrice());
200	199	float longPrice = getValidPrice(mberManageVO.getLongPrice(), sysJoinSetVO.getLongPrice());
	200	+ float kakaoAtPrice = getValidPrice(mberManageVO.getKakaoAtPrice(), sysJoinSetVO.getKakaoAtPrice());
201	201
202	202
203	203	String shortPStr = Float.toString(shortPrice);
204	204	String mmsPStr = Float.toString(longPrice);
	205	+ String kakaoAtPStr = Float.toString(kakaoAtPrice);
205	206
206	207	// 공통 가격 설정
207	208	sendVO.setSmsPrice(shortPStr);
208	209	sendVO.setMmsPrice(mmsPStr);
	210	+ sendVO.setKakaoAtPrice(kakaoAtPStr);
209	211
210	212
211	213	if("Y".equals(kakaoVO.getSubMsgSendYn())) {
...	...	@@ -222,8 +224,7 @@
222	224
223	225
224	226	} else {
225		- kakaoAtPrice = getValidPrice(mberManageVO.getKakaoAtPrice(), sysJoinSetVO.getKakaoAtPrice());
226		- sendVO.setEachPrice( Float.toString(kakaoAtPrice) );
	227	+ sendVO.setEachPrice(kakaoAtPStr);
227	228	}
228	229
229	230

...	...	@@ -956,7 +956,7 @@
956	956
957	957	/** @biz_kakao_price에 insert (대체문자 환불관련 테이블)*/
958	958	kakaoVO.setMsgGroupId(sendVO.getMsgGroupId());
959		- kakaoVO.setKakaoAtPrice(Float.parseFloat(sendVO.getEachPrice()));
	959	+ kakaoVO.setKakaoAtPrice(Float.parseFloat(sendVO.getKakaoAtPrice()));
960	960	kakaoVO.setSmsPrice(Float.parseFloat(sendVO.getSmsPrice()));
961	961	kakaoVO.setMmsPrice(Float.parseFloat(sendVO.getMmsPrice()));
962	962

...	...	@@ -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
...	...	@@ -290,6 +290,7 @@
290	290	//성공 건수 세팅
291	291	KakaoSentVO eachCnt = new KakaoSentVO();
292	292	eachCnt.setMsgGroupId(result.getMsgGroupId());
	293	+ eachCnt.setBizKakaoResendYn("Y".equals(result.getBizKakaoResendYn()) ? "Y" : "N");
293	294	try {
294	295	eachCnt = kakaoSentDAO.selectKakaoSentCntEachCnt_advc(eachCnt);
295	296	} catch (Exception e) {

...	...	@@ -1664,63 +1664,48 @@
1664	1664
1665	1665	<select id="KakaoSentDAO.selectKakaoSentCntEachCnt_advc" parameterClass="kakaoSentVO" resultClass="kakaoSentVO">
1666	1666	SELECT
1667		- a.MSG_GROUP_ID AS msgGroupId,
1668		- a.successCount,
1669		- a.waitCount,
1670		- a.failCount,
1671		- a.kakaoResendSuccCount,
1672		- a.kakaoResendFailCount,
1673		- a.successCount * bkp.BIZ_KAKAO_AT_PRICE AS successPrice,
1674		- (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE) AS kakaoResendSuccPrice,
1675		- a.divideYn
	1667	+ a.MSG_GROUP_ID AS msgGroupId
	1668	+ , a.successCount
	1669	+ , a.waitCount
	1670	+ , a.failCount
	1671	+ , a.divideYn
	1672	+ <isEqual property="bizKakaoResendYn" compareValue="Y">
	1673	+ , a.kakaoResendSuccCount
	1674	+ , a.kakaoResendFailCount
	1675	+ , a.successCount * bkp.BIZ_KAKAO_AT_PRICE AS successPrice
	1676	+ , (a.smsCnt * bkp.BIZ_SMS_PRICE) + (a.mmsCnt * bkp.BIZ_MMS_PRICE) AS kakaoResendSuccPrice
	1677	+ </isEqual>
	1678	+ <isNotEqual property="bizKakaoResendYn" compareValue="Y">
	1679	+ , 0 AS kakaoResendSuccCount
	1680	+ , 0 AS kakaoResendFailCount
	1681	+ , 0 AS successPrice
	1682	+ , 0 AS kakaoResendSuccPrice
	1683	+ </isNotEqual>
1676	1684	FROM (
1677	1685	SELECT
1678		- t1.MSG_GROUP_ID,
1679		- SUM(IF(t1.RESERVE_C_YN = 'N' AND t1.RSLT_CODE = '7000', 1, 0)) AS successCount,
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		- 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,
1713		- CASE
1714		- WHEN COUNT(DISTINCT t1.REQ_DATE) > 1 THEN 'Y'
1715		- ELSE 'N'
1716		- END AS divideYN
	1686	+ t1.MSG_GROUP_ID
	1687	+ , SUM(IF(t1.RESERVE_C_YN = 'N' AND t1.RSLT_CODE = '7000', 1, 0)) AS successCount
	1688	+ , 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
	1689	+ , SUM(IF(t1.RESERVE_C_YN = 'N' AND t1.RSLT_CODE != '7000' AND t1.RSLT_CODE IS NOT NULL, 1, 0)) AS failCount
	1690	+ , CASE
	1691	+ WHEN COUNT(DISTINCT t1.REQ_DATE) > 1 THEN 'Y'
	1692	+ ELSE 'N'
	1693	+ END AS divideYN
	1694	+ <isEqual property="bizKakaoResendYn" compareValue="Y">
	1695	+ , SUM(IF(t1.BIZ_KAKAO_RESEND_YN = 'Y' AND BL1.CALL_STATUS IN ('6600', '4100'), 1,0)) AS kakaoResendSuccCount
	1696	+ , SUM(IF(t1.BIZ_KAKAO_RESEND_YN = 'Y' AND BL1.CALL_STATUS not IN ('6600', '4100'), 1,0)) AS kakaoResendFailCount
	1697	+ , SUM(IF(t1.BIZ_KAKAO_RESEND_YN = 'Y' AND BL1.CALL_STATUS IN ('6600', '4100') AND t1.BIZ_KAKAO_RESEND_TYPE = 'SMS', 1, 0)) AS smsCnt
	1698	+ , SUM(IF(t1.BIZ_KAKAO_RESEND_YN = 'Y' AND BL1.CALL_STATUS IN ('6600', '4100') AND t1.BIZ_KAKAO_RESEND_TYPE = 'MMS', 1, 0)) AS mmsCnt
	1699	+ </isEqual>
1717	1700	FROM mj_msg_data t1 FORCE INDEX (idx_msgdata_groupid_delfalg_msgtype_curstate)
1718		- LEFT OUTER JOIN BIZ_LOG BL1 ON t1.BIZ_UMID = BL1.CMID
	1701	+ <isEqual property="bizKakaoResendYn" compareValue="Y">
	1702	+ LEFT OUTER JOIN BIZ_LOG BL1 ON t1.BIZ_UMID = BL1.CMID
	1703	+ </isEqual>
1719	1704	WHERE
1720		- t1.DEL_FLAG = 'N'
	1705	+ t1.MSG_GROUP_ID = #msgGroupId#
1721	1706	AND t1.MSG_TYPE IN ('8', '9')
1722	1707	AND t1.CUR_STATE IN ('0', '1', '2', '3')
1723		- AND t1.MSG_GROUP_ID = #msgGroupId#
	1708	+ AND t1.DEL_FLAG = 'N'
1724	1709	GROUP BY t1.MSG_GROUP_ID
1725	1710	) a
1726	1711	LEFT OUTER JOIN BIZ_KAKAO_PRICE bkp ON bkp.MSG_GROUP_ID = a.MSG_GROUP_ID

...	...	@@ -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

...	...	@@ -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> >100개보기</option>
117	124	</select>
118	125	</div>
119	126	</div>

...	...	@@ -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>

...	...	@@ -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();

Delete comment