Commit @389dd997be729e90152e1123916d49980fb8f656

이호영 2025-04-08

Merge branch 'advc'

@389dd997be729e90152e1123916d49980fb8f656

865fb0e

389dd99

src/main/java/itn/let/kakao/user/sent/service/KakaoSentVO.java

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

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


 	
 	private String statusCd;
 	
-	private int successPrice;
-	private int kakaoResendSuccPrice;
+	private String successPrice;
+	private String kakaoResendSuccPrice;
 	
 	private String divideYn;
 	

865fb0e

389dd99

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


 		
 	}
 	
-	private String priceProc(int successPrice, int kakaoResendSuccPrice) {
+	private String priceProc(String successPrice, String kakaoResendSuccPrice) {
 		
 		String totPrice = "-";
 		

 		BigDecimal totalPrice = atPrice.add(kakaoResendPrice);
 		// 소수점 한 자리로 설정 (반올림)// totalPrice 값을 소수점 한 자리까지 반올림하여 roundedTotalPrice에 저장
 		// RoundingMode.HALF_UP: 반올림 방식으로, 소수점 기준 5 이상이면 올림, 그렇지 않으면 내림
-		BigDecimal roundedTotalPrice = totalPrice.setScale(1, RoundingMode.HALF_UP);
+//		BigDecimal roundedTotalPrice = totalPrice.setScale(1, RoundingMode.HALF_UP);
+		BigDecimal roundedTotalPrice = totalPrice;
 		
 		// roundedTotalPrice가 0인지 확인
 		// BigDecimal.compareTo(BigDecimal.ZERO)는 값을 비교하는 메서드

865fb0e

389dd99

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


 						AND B.RESERVE_YN  = 'N'
 					</isEqual>
 				</isNotEmpty>
+				<isNotEmpty property="searchKeyword">
+					<isEqual property="searchCondition" compareValue="3">
+						AND  B.SMS_TXT like CONCAT('%', #searchKeyword#, '%')
+					</isEqual>
+				</isNotEmpty>
 				GROUP BY B.MSG_GROUP_ID
 				ORDER BY 1=1
 				<isNotEmpty property="searchSortCnd">

 	</select>
 	
 	<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
-		FROM   (SELECT  t1.MSG_GROUP_ID,
-		                ( SELECT COUNT(0)
-		                FROM    MJ_MSG_DATA C
-		                WHERE   C.RESERVE_C_YN = 'N'
-		                AND     C.MSG_GROUP_ID = t1.MSG_GROUP_ID
-		                AND     C.RSLT_CODE    = '7000'
-		                )
-		                AS successCount ,
-		                ( SELECT COUNT(0)
-		                FROM    MJ_MSG_DATA C
-		                WHERE   C.RESERVE_C_YN = 'N'
-		                AND     C.MSG_GROUP_ID = t1.MSG_GROUP_ID
-		                AND
-		                        (
-		                                C.RSLT_CODE IS NULL
-		                        AND     C.SENT_DATE IS NULL
-		                        AND     C.RSLT_DATE IS NULL
-		                        )
-		                )
-		                AS waitCount ,
-		                ( SELECT COUNT(0)
-		                FROM    MJ_MSG_DATA C
-		                WHERE   C.RESERVE_C_YN = 'N'
-		                AND     C.MSG_GROUP_ID = t1.MSG_GROUP_ID
-		                AND
-		                        (
-		                                C.RSLT_CODE          != '7000'
-		                        AND     C.RSLT_CODE IS NOT NULL
-		                        )
-		                )
-		                AS failCount ,
-		                ( 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'
-		                )
-		                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'
-						END AS divideYN
-		FROM     mj_msg_data t1
-        WHERE    t1.DEL_FLAG = 'N'
-        AND      t1.MSG_TYPE IN ('8',
-                                '9')
-        AND      t1.CUR_STATE IN ('0',
-                                  '1',
-                                  '2',
-                                  '3')
-        AND      t1.MSG_GROUP_ID = #msgGroupId#
-        GROUP BY t1.MSG_GROUP_ID
-        )
-        a
-        LEFT OUTER JOIN BIZ_KAKAO_PRICE bkp
-        ON     bkp.MSG_GROUP_ID = a.MSG_GROUP_ID
+		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
+		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
+		    FROM mj_msg_data t1
+		    LEFT OUTER JOIN BIZ_LOG BL1 ON t1.BIZ_UMID = BL1.CMID
+		    WHERE 
+		        t1.DEL_FLAG = 'N'
+		        AND t1.MSG_TYPE IN ('8', '9')
+		        AND t1.CUR_STATE IN ('0', '1', '2', '3')
+		        AND t1.MSG_GROUP_ID = #msgGroupId#
+		    GROUP BY t1.MSG_GROUP_ID
+		) a
+		LEFT OUTER JOIN BIZ_KAKAO_PRICE bkp ON bkp.MSG_GROUP_ID = a.MSG_GROUP_ID
 	</select>
 	
 	<!-- 알림톡 발송결과 상세 데이터-->

865fb0e

389dd99

src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp

--- src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp


 
 //재전송 스크립트 수정
 $(window).on('load', function() {
-    if(${msgResendAllFlag eq 'Y'}) {
+    if(${kakaoVO.msgResendAllFlag eq 'Y'}) {
         // 채널 ID 및 템플릿 선택 코드는 유지
         $("#selectKakaoProfileList option").filter(function() {
             return $(this).text() === '${kakaoVO.msgResendAllYellowId}';

         fn_viewDataInit02();
         priceInit();
         
-        try {
-            // JSON 파싱
-            var resendListObj = JSON.parse('${resendListJson}');
-            var listCnt = resendListObj.length;
-            
-            // 중복 제거 - Set 사용
-            var uniquePhones = new Set();
-            var uniqueResendList = [];
-            
-            // 중복 제거 로직
-            for(var i = 0; i < resendListObj.length; i++) {
-                var phone = removeDash(resendListObj[i].callTo);
-                if(!uniquePhones.has(phone)) {
-                    uniquePhones.add(phone);
-                    uniqueResendList.push(resendListObj[i]);
-                }
-            }
-            
-            
-            // 중복 제거된 데이터로 처리
-            for(var i = 0; i < uniqueResendList.length; i++) {
-                var phoneNumber = removeDash(uniqueResendList[i].callTo);
-                
-                // callTo 입력 필드에 값 설정 후 번호추가 버튼 클릭
-                $("#callTo").val(phoneNumber);
-                $(".addCallToF").trigger("click");
-                
-            }
-            
-            // 총 건수 확인
-            setTimeout(function() {
-                updateTotCnt();
-            }, 500);
-            
-        } catch(e) {
-            console.error("재전송 데이터 처리 오류:", e);
-        }
+        var varList = $("#excelTemplateContent").val().match(/#\{([^}]+)\}/g);
+    	if(varList == null){
+	        try {
+	            // JSON 파싱
+	            var resendListObj = JSON.parse('${resendListJson}');
+	            var listCnt = resendListObj.length;
+	            
+	            // 중복 제거 - Set 사용
+	            var uniquePhones = new Set();
+	            var uniqueResendList = [];
+	            
+	            // 중복 제거 로직
+	            for(var i = 0; i < resendListObj.length; i++) {
+	                var phone = removeDash(resendListObj[i].callTo);
+	                if(!uniquePhones.has(phone)) {
+	                    uniquePhones.add(phone);
+	                    uniqueResendList.push(resendListObj[i]);
+	                }
+	            }
+	            
+	            
+	            // 중복 제거된 데이터로 처리
+	            for(var i = 0; i < uniqueResendList.length; i++) {
+	                var phoneNumber = removeDash(uniqueResendList[i].callTo);
+	                
+	                // callTo 입력 필드에 값 설정 후 번호추가 버튼 클릭
+	                $("#callTo").val(phoneNumber);
+	                $(".addCallToF").trigger("click");
+	                
+	            }
+	            
+	            // 총 건수 확인
+	            setTimeout(function() {
+	                updateTotCnt();
+	            }, 500);
+	            
+	        } catch(e) {
+	            console.error("재전송 데이터 처리 오류:", e);
+	        }
+    	}
+        
     }
 });
 

865fb0e

389dd99

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


                                 </div>
                             </td>
 							<td>
-								<c:out value="${resultAllSentList.msgGroupCnt}"/>
+								<fmt:formatNumber value="${resultAllSentList.msgGroupCnt}" type="number" groupingUsed="true" />
+<%-- 								<c:out value="${resultAllSentList.msgGroupCnt}"/> --%>
 							</td>
 							<td>
 								<fmt:formatNumber value="${resultAllSentList.waitCount}" type="number" groupingUsed="true" />

865fb0e

389dd99

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


 
 function fnSearch(pageNo){
 	
-	var form = document.searchForm;
+// 	var form = document.searchForm;
 	
-	form.pageIndex.value = pageNo ;
+// 	form.pageIndex.value = pageNo ;
 	
 	
-	form.action="/web/kakao/sent/selectKakaoSentView.do";
-	form.submit();
-	
+// 	form.action="/web/kakao/sent/selectKakaoSentView.do";
+// 	form.submit();
+	cntSet();
+	linkPage(pageNo);
 }
 
 function fnExcelDownLoad(pageType, listType){

 						<div class="btn_right">
 							<label for="searchCondition" class="label">발신번호 선택 == ${kakaoSentVO.searchCondition}</label>
 							<select name="searchCondition" id="searchCondition" class="selType2">
-								<option value="4" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >채널ID</option>
-								<option value="5" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >내용</option>
-								<option value="3" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >수신번호</option>
+<%-- 								<option value="4" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >채널ID</option> --%>
+								<option value="3" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >내용</option>
+<%-- 								<option value="3" <c:if test="${kakaoSentVO.searchCondition == '3'}">selected</c:if> >수신번호</option> --%>
 							</select>
 							<div class="search">
 								<label for="id" class="label"></label>

 									<button type="button" onclick="fnListLoad('Y','2'); return false;">예약</button>
 								</li>
 							</ul>
+							<!-- 발송화면 개선 : 발송결과 추가-->
+							<div class="tab_btnbox">
+								<button type="button" class="btnType btnType14 check_validity">발송결과<i class="qmMark"></i></button>
+								<div class="info_hover_cont send_hover_cont price_hover">
+									<dl>
+										<dt class="c_222">[<span>대기</span>]</dt>
+										<dd>발송은 성공하였으며, 수신자측 통신사로부터 수신여부를 확인중인 상태 <br>
+                                               <span>※ 예약발송의 경우 실발송 전까지는 “대기”로 표시</span>
+                                           </dd>
+										<dt class="c_002c9a">[<span>성공</span>]</dt>
+										<dd>발송 및 수신이 완료된 상태</dd>
+										<dt class="c_e40000">[<span>실패</span>]</dt>
+										<dd class="last">결번, 일시정지, 전화번호 오류 등의 사유로 발송이
+											불가한 상태</dd>
+									</dl>
+								</div>
+							</div>
+							<!--// 발송화면 개선 : 발송결과 추가-->
 						</div>
 						<!-- 발송관리 리스트 -->
 						<div class="table_cont current msgSentAllLoad" id="tableCont_1">

865fb0e

389dd99

src/main/webapp/publish/css/content.css

--- src/main/webapp/publish/css/content.css

+++ src/main/webapp/publish/css/content.css


 /*// 발송결과 화면개선 */
 .table {display: table;width: 100%;}
 .table_cell {display: table-cell;vertical-align: middle;}
-.table_cell1 {display: table-cell;vertical-align: top; position: relative; top: 25px;}
 .vMiddle {vertical-align: middle;}
 .tRight {text-align: right !important;}
 .tLeft {text-align: left !important;}

 .send_general.sec .tType1 tbody tr:first-child {border-top: 0;}
 .send_top .excelWrap {padding: 20px 0;}
 .excel_middle {background-color: #f2f2f2; padding: 9px 20px; border-radius: 5px; margin: 20px 0;}
-.excel_middle .select_btnWrap div{gap:6px;}
 .send_top .excelWrap .excel_selBox {margin-bottom: 10px; display: flex; justify-content: space-between;}
 .send_top .excelWrap .excel_selBox select.selType1 {padding: 0 80px 0 10px;}
 .send_top .excelWrap .excel_selBox span {color: #e40000; font-size: 14px; padding-left: 5px;}

 .kakaotalkset_cont .list_info .btn_list{background-image: url(/publish/images/btn_list_icon.png);}
 .kakaotalkset_cont .list_info .btn_thumbnail{background-image: url(/publish/images/btn_thumbnail_icon.png);}
 .kakaotalkset_cont .list_info .btnType8{width: 140px;}
-.kakaotalkset_cont .kakao_template_list{display:flex;margin: 20px 0 0 0;flex-wrap:wrap;gap:13px;}
-/* .kakaotalkset_cont .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 135px)/4); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px; margin: 0 20px 40px 0;} */
-.kakaotalkset_cont .kakao_template_list li{position: relative; width:calc((100%/4) - 26px); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px;}
+.kakaotalkset_cont .kakao_template_list{margin: 20px 0 0 0;}
+.kakaotalkset_cont .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 135px)/4); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px; margin: 0 20px 40px 0;}
 .kakaotalkset_cont .kakao_template_list li.template_none{box-shadow: none; width: 100%; text-align: center; font-size: 18px; font-weight: 400;}
 .kakaotalkset_cont .kakao_template_list li.template_none::after{display: none;}
 .kakaotalkset_cont .kakao_template_list li:nth-child(4n){margin: 0 0 0 0;}

 .send_top .kakaotalksend_cont .kakao_wrap .send_left .variable_wrap .excel_btn{height: 40px; border: 5px solid #129738; color: #129738; font-size: 16px; font-weight: 500; padding: 0 15px; border-radius: 5px;}
 .send_top .kakaotalksend_cont .kakao_wrap .send_left .variable_wrap .excel_btn i{width: 17px; height: 15px; background-image: url(/publish/images/content/excel_img.png); margin: 0 5px 5px 0;}
 .send_top .kakaotalksend_cont .kakao_wrap .send_left .receiver_wrap01{display: none !important;}
-.send_top .kakaotalksend_cont .kakao_wrap .send_left .receiver_wrap02 .btnType{margin:0 0 0 6px;}
 .send_top .kakaotalksend_cont .kakao_wrap .send_left .receiver_wrap02 .listType{width: 100%;}
 .send_top .kakaotalksend_cont .kakao_wrap .send_left .receipt_num .list_table_num{width: calc(100% - 60px);}
 .kakaotalksend_cont .kakao_wrap .put_right .qmMark{width: 19px; height: 19px; background-image: url(/publish/images/content/qmIcon_s.png); margin: -0.3px 0 2px 4px;}

 .kakaotalksend_cont .kakao_wrap .kakao_template_text {display: flex;justify-content: space-between;}
 .kakaotalksend_cont .kakao_wrap .put_right .btn_popup_wrap{margin: 0 0 5px 0;}
 .kakaotalksend_cont .kakao_wrap .replace_send_wrap .put_left{height: 234px;}
-.kakaotalksend_cont .kakao_wrap .replace_send_wrap .put_left.short textarea{height: calc(100% - 80px);}
+.kakaotalksend_cont .kakao_wrap .replace_send_wrap .put_left.short textarea{height: calc(100% - 58px);}
 .kakaotalksend_cont .kakao_wrap .button_type_wrap{display: flex; border: 1px solid #e5e5e5; border-radius: 5px; padding: 10px 20px; margin: 10px 0 0 0;}
 .kakaotalksend_cont .kakao_wrap .button_type_wrap dt{width: 110px; font-weight: 400; padding: 8px 0 0 0;}
 .kakaotalksend_cont .kakao_wrap .button_type_wrap .button_type_input{width: 483px;}

 
 .res_info .res_info_in .res_info_btm {margin:20px 0 0 0;padding:10px;background:#fff;border-radius:5px;box-sizing:border-box;}
 .res_info .res_info_in .res_info_btm dl {display:flex;padding:8px 10px;font-size:16px;font-weight:300;justify-content:space-between; color:#222;}
-.res_info .res_info_in .res_info_btm .charge_line {border-top:1px solid #e6e6e6; text-align:center; margin:0 10px; padding:7px 0 5px 0; }
-.res_info .res_info_in .res_info_btm .charge_line dl {padding:7px 0 5px 10px; }
-.res_info .res_info_in .res_info_btm .charge_line dl dt {font-size:15px;}
-.res_info .res_info_in .res_info_btm .charge_line dl dd {padding:0; font-size:16px;}
-.res_info .res_info_in .res_info_btm dl dt.charge_title {font-size:15px; padding:0 0 0 5px;}
 .res_info .res_info_in .res_info_btm dl dt {font-weight:400;}
 .res_info .res_info_in .res_info_btm dl dt.btm_charge {font-size:16px;}
 .res_info .res_info_in .res_info_btm dl dd span {font-weight:500;}

 /* right area 문자 미리보기 */
 .send_top .resultcont_right {flex-basis: calc(100% - 68% - 80px); position: relative;min-height:630px;}
 .send_top .send_general.sec .resultcont_right {min-height:auto;}
-.send_top .resultcont_right .tab_phone {display: none; } 
-.send_top .resultcont_right .tab_phone.current {display: block;} 
-
 /* phone 기본 -- sticky */
 .send_top .resultcont_right .phone {width: 374px; position: absolute; right: -2px; top: 0;}
 .send_top .resultcont_right .phone .phoneIn {background-image: url(/publish/images/content/phoneBg.png); height: 720px; background-size: 100% auto; background-repeat: no-repeat; }
-.send_top .resultcont_right .phone .phoneIn>div {padding: 45px 30px 25px 30px; position: relative; height: 96%; box-sizing: border-box;}
+.send_top .resultcont_right .phone .phoneIn>div {padding: 45px 30px 0 30px; position: relative; height: 96%; box-sizing: border-box;}
 .send_top .resultcont_right .phone .prev_p {font-size: 20px;font-weight: 500;padding-bottom: 12px;border-bottom: 1px solid #e5e5e5;}
 .send_top .resultcont_right .phone .text_length2 {padding: 12px 0;}
 .send_top .resultcont_right .phone .text_length2>span {float: left;line-height: 27px;}

 
 /* 알림톡 미리보기 */
 .send_top .resultcont_right .phone_kakao {width: 374px; position: absolute; right:0; top: 0;} 
-.send_top .resultcont_right .phone_kakako .phoneIn{height: 720px; width:346px; background-image: url(/publish/images/content/kakaoBg_01.png); padding: 27px 25px 0 25px; margin:0 0 0 -12px;}
+.send_top .resultcont_right .phone_kakako .phoneIn{height: 690px; width:340px; background-image: url(/publish/images/content/kakaoBg.png); padding: 27px 25px 0 25px;}
 .send_top .resultcont_right .phone_kakako .prev_p{padding: 0 0 0 10px; border: 0; letter-spacing: -0.25px;}
 .send_top .resultcont_right .phone_kakako .prev_p img{margin: 0 10px 0 0;}
 .send_top .resultcont_right .phone_kakako .allimtalk_title{position: relative; width: calc(100% - 20px); background-color: #fae100; font-family: 'LotteMartDream'; font-size: 18px; padding: 12px 21px; border-radius: 5px 5px 0 0; box-sizing: border-box;}

 .send_top .resultcont_right .phone_kakako .phoneIn .text_preview .allimtalk_content .btn_kakao_type{width: calc(100% - 20px); height: 40px; font-size: 15px; border-radius: 5px; background-color: #ededed;}
 .send_top .resultcont_right .phone_kakako .phoneIn .template_info_wrap{display: flex; width: calc(85% + 13px); height: auto; padding: 6px 15px 6px 23px; justify-content: space-between; align-items: center; background-color: #fae100; margin: -5px 0 0 -3px; border-radius: 0 0 25px 25px;}
 .send_top .resultcont_right .phone_kakako .phoneIn .template_info_wrap .btn_template_choice{width: 120px; height: 36px; font-size: 16px; color: #fae100; background-color: #302218; border-radius: 5px;}
-.send_top .resultcont_right .phone_kakako .addText{color: #002c9a;text-align: center; font-size: 14px; padding-top: 2px; margin:-27px 0 10px 0;}
+.send_top .resultcont_right .phone_kakako .addText{color: #002c9a;text-align: center; font-size: 14px; padding-top: 2px; margin:10px 0 10px 0;}
 
 .btn_list_type1 {border-top:solid 1px #e5e5e5; text-align: right; padding:26px 0 0 0; margin:60px 0 0 0;}
 .btn_list_type1 .btnType.btnType17 {width:100px; }

 
 .tb_wrap1{height:302px; overflow-y: auto; position:relative; border:1px solid #ccc; border-radius:5px;}
 .tb_wrap1 table.type4 th{position: sticky; top:0; z-index: 1; background-color:#ededed;}
-
-/*문자전송_안심번호 안내 추가*/
-.top_content .send_general .send_left .tType1 .btn_popup_wrap .info_guide{margin: -11px 0 0 0; text-align: left; line-height: 1.3; font-size: 14px; color: #e40000; font-weight: 400;}
-.top_content .send_general .send_left .tType1 .btn_popup_wrap .info_guide:hover{text-decoration: underline;}
-.tType1 tbody tr td.putText textarea.phone_num{height: 84px;}
 
 
 @keyframes rotate-loading {

 	.sub .election .receipt_number_table_wrap .list_bottom{width:100%;}
 	.sub .election .list_bottom .list_bottom_right button{height:30px;font-size:14px;letter-spacing:-1.4px;}
 	.sub .election .list_bottom .pagination button{display:inline-flex;width:25px;height:30px;align-items:center;justify-content:center;}
-	
-	/*문자전송_안심번호 안내 추가*/
-	.top_content .send_general .send_left .tType1 .btn_popup_wrap .info_guide{margin: 0 0 0 11px; text-indent: -11px;}
-	.tType1 tbody tr td.putText textarea.phone_num{height: 103px;}
 }
 
 @media only screen and (max-width:1380px){

Add a comment

Open 0
Closed 0

List

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

...	...	@@ -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)는 값을 비교하는 메서드

...	...	@@ -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	<!-- 알림톡 발송결과 상세 데이터-->

...	...	@@ -1228,7 +1228,7 @@
1228	1228
1229	1229	//재전송 스크립트 수정
1230	1230	$(window).on('load', function() {
1231		- if(${msgResendAllFlag eq 'Y'}) {
	1231	+ if(${kakaoVO.msgResendAllFlag eq 'Y'}) {
1232	1232	// 채널 ID 및 템플릿 선택 코드는 유지
1233	1233	$("#selectKakaoProfileList option").filter(function() {
1234	1234	return $(this).text() === '${kakaoVO.msgResendAllYellowId}';
...	...	@@ -1242,43 +1242,47 @@
1242	1242	fn_viewDataInit02();
1243	1243	priceInit();
1244	1244
1245		- try {
1246		- // JSON 파싱
1247		- var resendListObj = JSON.parse('${resendListJson}');
1248		- var listCnt = resendListObj.length;
1249		-
1250		- // 중복 제거 - Set 사용
1251		- var uniquePhones = new Set();
1252		- var uniqueResendList = [];
1253		-
1254		- // 중복 제거 로직
1255		- for(var i = 0; i < resendListObj.length; i++) {
1256		- var phone = removeDash(resendListObj[i].callTo);
1257		- if(!uniquePhones.has(phone)) {
1258		- uniquePhones.add(phone);
1259		- uniqueResendList.push(resendListObj[i]);
1260		- }
1261		- }
1262		-
1263		-
1264		- // 중복 제거된 데이터로 처리
1265		- for(var i = 0; i < uniqueResendList.length; i++) {
1266		- var phoneNumber = removeDash(uniqueResendList[i].callTo);
1267		-
1268		- // callTo 입력 필드에 값 설정 후 번호추가 버튼 클릭
1269		- $("#callTo").val(phoneNumber);
1270		- $(".addCallToF").trigger("click");
1271		-
1272		- }
1273		-
1274		- // 총 건수 확인
1275		- setTimeout(function() {
1276		- updateTotCnt();
1277		- }, 500);
1278		-
1279		- } catch(e) {
1280		- console.error("재전송 데이터 처리 오류:", e);
1281		- }
	1245	+ var varList = $("#excelTemplateContent").val().match(/#\{([^}]+)\}/g);
	1246	+ if(varList == null){
	1247	+ try {
	1248	+ // JSON 파싱
	1249	+ var resendListObj = JSON.parse('${resendListJson}');
	1250	+ var listCnt = resendListObj.length;
	1251	+
	1252	+ // 중복 제거 - Set 사용
	1253	+ var uniquePhones = new Set();
	1254	+ var uniqueResendList = [];
	1255	+
	1256	+ // 중복 제거 로직
	1257	+ for(var i = 0; i < resendListObj.length; i++) {
	1258	+ var phone = removeDash(resendListObj[i].callTo);
	1259	+ if(!uniquePhones.has(phone)) {
	1260	+ uniquePhones.add(phone);
	1261	+ uniqueResendList.push(resendListObj[i]);
	1262	+ }
	1263	+ }
	1264	+
	1265	+
	1266	+ // 중복 제거된 데이터로 처리
	1267	+ for(var i = 0; i < uniqueResendList.length; i++) {
	1268	+ var phoneNumber = removeDash(uniqueResendList[i].callTo);
	1269	+
	1270	+ // callTo 입력 필드에 값 설정 후 번호추가 버튼 클릭
	1271	+ $("#callTo").val(phoneNumber);
	1272	+ $(".addCallToF").trigger("click");
	1273	+
	1274	+ }
	1275	+
	1276	+ // 총 건수 확인
	1277	+ setTimeout(function() {
	1278	+ updateTotCnt();
	1279	+ }, 500);
	1280	+
	1281	+ } catch(e) {
	1282	+ console.error("재전송 데이터 처리 오류:", e);
	1283	+ }
	1284	+ }
	1285	+
1282	1286	}
1283	1287	});
1284	1288

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

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

...	...	@@ -20,7 +20,6 @@
20	20	/// 발송결과 화면개선 /
21	21	.table {display: table;width: 100%;}
22	22	.table_cell {display: table-cell;vertical-align: middle;}
23		-.table_cell1 {display: table-cell;vertical-align: top; position: relative; top: 25px;}
24	23	.vMiddle {vertical-align: middle;}
25	24	.tRight {text-align: right !important;}
26	25	.tLeft {text-align: left !important;}
...	...	@@ -602,7 +601,6 @@
602	601	.send_general.sec .tType1 tbody tr:first-child {border-top: 0;}
603	602	.send_top .excelWrap {padding: 20px 0;}
604	603	.excel_middle {background-color: #f2f2f2; padding: 9px 20px; border-radius: 5px; margin: 20px 0;}
605		-.excel_middle .select_btnWrap div{gap:6px;}
606	604	.send_top .excelWrap .excel_selBox {margin-bottom: 10px; display: flex; justify-content: space-between;}
607	605	.send_top .excelWrap .excel_selBox select.selType1 {padding: 0 80px 0 10px;}
608	606	.send_top .excelWrap .excel_selBox span {color: #e40000; font-size: 14px; padding-left: 5px;}
...	...	@@ -1578,9 +1576,8 @@
1578	1576	.kakaotalkset_cont .list_info .btn_list{background-image: url(/publish/images/btn_list_icon.png);}
1579	1577	.kakaotalkset_cont .list_info .btn_thumbnail{background-image: url(/publish/images/btn_thumbnail_icon.png);}
1580	1578	.kakaotalkset_cont .list_info .btnType8{width: 140px;}
1581		-.kakaotalkset_cont .kakao_template_list{display:flex;margin: 20px 0 0 0;flex-wrap:wrap;gap:13px;}
1582		-/* .kakaotalkset_cont .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 135px)/4); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px; margin: 0 20px 40px 0;} */
1583		-.kakaotalkset_cont .kakao_template_list li{position: relative; width:calc((100%/4) - 26px); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px;}
	1579	+.kakaotalkset_cont .kakao_template_list{margin: 20px 0 0 0;}
	1580	+.kakaotalkset_cont .kakao_template_list li{position: relative; display: inline-block; width: calc((100% - 135px)/4); border-radius: 25px; box-shadow: inset 0 0px 8px rgba(0,0,0,0.2); padding: 8px 8px 16px 8px; margin: 0 20px 40px 0;}
1584	1581	.kakaotalkset_cont .kakao_template_list li.template_none{box-shadow: none; width: 100%; text-align: center; font-size: 18px; font-weight: 400;}
1585	1582	.kakaotalkset_cont .kakao_template_list li.template_none::after{display: none;}
1586	1583	.kakaotalkset_cont .kakao_template_list li:nth-child(4n){margin: 0 0 0 0;}
...	...	@@ -1736,7 +1733,6 @@
1736	1733	.send_top .kakaotalksend_cont .kakao_wrap .send_left .variable_wrap .excel_btn{height: 40px; border: 5px solid #129738; color: #129738; font-size: 16px; font-weight: 500; padding: 0 15px; border-radius: 5px;}
1737	1734	.send_top .kakaotalksend_cont .kakao_wrap .send_left .variable_wrap .excel_btn i{width: 17px; height: 15px; background-image: url(/publish/images/content/excel_img.png); margin: 0 5px 5px 0;}
1738	1735	.send_top .kakaotalksend_cont .kakao_wrap .send_left .receiver_wrap01{display: none !important;}
1739		-.send_top .kakaotalksend_cont .kakao_wrap .send_left .receiver_wrap02 .btnType{margin:0 0 0 6px;}
1740	1736	.send_top .kakaotalksend_cont .kakao_wrap .send_left .receiver_wrap02 .listType{width: 100%;}
1741	1737	.send_top .kakaotalksend_cont .kakao_wrap .send_left .receipt_num .list_table_num{width: calc(100% - 60px);}
1742	1738	.kakaotalksend_cont .kakao_wrap .put_right .qmMark{width: 19px; height: 19px; background-image: url(/publish/images/content/qmIcon_s.png); margin: -0.3px 0 2px 4px;}
...	...	@@ -1744,7 +1740,7 @@
1744	1740	.kakaotalksend_cont .kakao_wrap .kakao_template_text {display: flex;justify-content: space-between;}
1745	1741	.kakaotalksend_cont .kakao_wrap .put_right .btn_popup_wrap{margin: 0 0 5px 0;}
1746	1742	.kakaotalksend_cont .kakao_wrap .replace_send_wrap .put_left{height: 234px;}
1747		-.kakaotalksend_cont .kakao_wrap .replace_send_wrap .put_left.short textarea{height: calc(100% - 80px);}
	1743	+.kakaotalksend_cont .kakao_wrap .replace_send_wrap .put_left.short textarea{height: calc(100% - 58px);}
1748	1744	.kakaotalksend_cont .kakao_wrap .button_type_wrap{display: flex; border: 1px solid #e5e5e5; border-radius: 5px; padding: 10px 20px; margin: 10px 0 0 0;}
1749	1745	.kakaotalksend_cont .kakao_wrap .button_type_wrap dt{width: 110px; font-weight: 400; padding: 8px 0 0 0;}
1750	1746	.kakaotalksend_cont .kakao_wrap .button_type_wrap .button_type_input{width: 483px;}
...	...	@@ -2126,11 +2122,6 @@
2126	2122
2127	2123	.res_info .res_info_in .res_info_btm {margin:20px 0 0 0;padding:10px;background:#fff;border-radius:5px;box-sizing:border-box;}
2128	2124	.res_info .res_info_in .res_info_btm dl {display:flex;padding:8px 10px;font-size:16px;font-weight:300;justify-content:space-between; color:#222;}
2129		-.res_info .res_info_in .res_info_btm .charge_line {border-top:1px solid #e6e6e6; text-align:center; margin:0 10px; padding:7px 0 5px 0; }
2130		-.res_info .res_info_in .res_info_btm .charge_line dl {padding:7px 0 5px 10px; }
2131		-.res_info .res_info_in .res_info_btm .charge_line dl dt {font-size:15px;}
2132		-.res_info .res_info_in .res_info_btm .charge_line dl dd {padding:0; font-size:16px;}
2133		-.res_info .res_info_in .res_info_btm dl dt.charge_title {font-size:15px; padding:0 0 0 5px;}
2134	2125	.res_info .res_info_in .res_info_btm dl dt {font-weight:400;}
2135	2126	.res_info .res_info_in .res_info_btm dl dt.btm_charge {font-size:16px;}
2136	2127	.res_info .res_info_in .res_info_btm dl dd span {font-weight:500;}
...	...	@@ -2148,13 +2139,10 @@
2148	2139	/* right area 문자 미리보기 */
2149	2140	.send_top .resultcont_right {flex-basis: calc(100% - 68% - 80px); position: relative;min-height:630px;}
2150	2141	.send_top .send_general.sec .resultcont_right {min-height:auto;}
2151		-.send_top .resultcont_right .tab_phone {display: none; }
2152		-.send_top .resultcont_right .tab_phone.current {display: block;}
2153		-
2154	2142	/* phone 기본 -- sticky */
2155	2143	.send_top .resultcont_right .phone {width: 374px; position: absolute; right: -2px; top: 0;}
2156	2144	.send_top .resultcont_right .phone .phoneIn {background-image: url(/publish/images/content/phoneBg.png); height: 720px; background-size: 100% auto; background-repeat: no-repeat; }
2157		-.send_top .resultcont_right .phone .phoneIn>div {padding: 45px 30px 25px 30px; position: relative; height: 96%; box-sizing: border-box;}
	2145	+.send_top .resultcont_right .phone .phoneIn>div {padding: 45px 30px 0 30px; position: relative; height: 96%; box-sizing: border-box;}
2158	2146	.send_top .resultcont_right .phone .prev_p {font-size: 20px;font-weight: 500;padding-bottom: 12px;border-bottom: 1px solid #e5e5e5;}
2159	2147	.send_top .resultcont_right .phone .text_length2 {padding: 12px 0;}
2160	2148	.send_top .resultcont_right .phone .text_length2>span {float: left;line-height: 27px;}
...	...	@@ -2185,7 +2173,7 @@
2185	2173
2186	2174	/* 알림톡 미리보기 */
2187	2175	.send_top .resultcont_right .phone_kakao {width: 374px; position: absolute; right:0; top: 0;}
2188		-.send_top .resultcont_right .phone_kakako .phoneIn{height: 720px; width:346px; background-image: url(/publish/images/content/kakaoBg_01.png); padding: 27px 25px 0 25px; margin:0 0 0 -12px;}
	2176	+.send_top .resultcont_right .phone_kakako .phoneIn{height: 690px; width:340px; background-image: url(/publish/images/content/kakaoBg.png); padding: 27px 25px 0 25px;}
2189	2177	.send_top .resultcont_right .phone_kakako .prev_p{padding: 0 0 0 10px; border: 0; letter-spacing: -0.25px;}
2190	2178	.send_top .resultcont_right .phone_kakako .prev_p img{margin: 0 10px 0 0;}
2191	2179	.send_top .resultcont_right .phone_kakako .allimtalk_title{position: relative; width: calc(100% - 20px); background-color: #fae100; font-family: 'LotteMartDream'; font-size: 18px; padding: 12px 21px; border-radius: 5px 5px 0 0; box-sizing: border-box;}
...	...	@@ -2209,7 +2197,7 @@
2209	2197	.send_top .resultcont_right .phone_kakako .phoneIn .text_preview .allimtalk_content .btn_kakao_type{width: calc(100% - 20px); height: 40px; font-size: 15px; border-radius: 5px; background-color: #ededed;}
2210	2198	.send_top .resultcont_right .phone_kakako .phoneIn .template_info_wrap{display: flex; width: calc(85% + 13px); height: auto; padding: 6px 15px 6px 23px; justify-content: space-between; align-items: center; background-color: #fae100; margin: -5px 0 0 -3px; border-radius: 0 0 25px 25px;}
2211	2199	.send_top .resultcont_right .phone_kakako .phoneIn .template_info_wrap .btn_template_choice{width: 120px; height: 36px; font-size: 16px; color: #fae100; background-color: #302218; border-radius: 5px;}
2212		-.send_top .resultcont_right .phone_kakako .addText{color: #002c9a;text-align: center; font-size: 14px; padding-top: 2px; margin:-27px 0 10px 0;}
	2200	+.send_top .resultcont_right .phone_kakako .addText{color: #002c9a;text-align: center; font-size: 14px; padding-top: 2px; margin:10px 0 10px 0;}
2213	2201
2214	2202	.btn_list_type1 {border-top:solid 1px #e5e5e5; text-align: right; padding:26px 0 0 0; margin:60px 0 0 0;}
2215	2203	.btn_list_type1 .btnType.btnType17 {width:100px; }
...	...	@@ -2402,11 +2390,6 @@
2402	2390
2403	2391	.tb_wrap1{height:302px; overflow-y: auto; position:relative; border:1px solid #ccc; border-radius:5px;}
2404	2392	.tb_wrap1 table.type4 th{position: sticky; top:0; z-index: 1; background-color:#ededed;}
2405		-
2406		-/문자전송_안심번호 안내 추가/
2407		-.top_content .send_general .send_left .tType1 .btn_popup_wrap .info_guide{margin: -11px 0 0 0; text-align: left; line-height: 1.3; font-size: 14px; color: #e40000; font-weight: 400;}
2408		-.top_content .send_general .send_left .tType1 .btn_popup_wrap .info_guide:hover{text-decoration: underline;}
2409		-.tType1 tbody tr td.putText textarea.phone_num{height: 84px;}
2410	2393
2411	2394
2412	2395	@keyframes rotate-loading {
...	...	@@ -2603,10 +2586,6 @@
2603	2586	.sub .election .receipt_number_table_wrap .list_bottom{width:100%;}
2604	2587	.sub .election .list_bottom .list_bottom_right button{height:30px;font-size:14px;letter-spacing:-1.4px;}
2605	2588	.sub .election .list_bottom .pagination button{display:inline-flex;width:25px;height:30px;align-items:center;justify-content:center;}
2606		-
2607		- /문자전송_안심번호 안내 추가/
2608		- .top_content .send_general .send_left .tType1 .btn_popup_wrap .info_guide{margin: 0 0 0 11px; text-indent: -11px;}
2609		- .tType1 tbody tr td.putText textarea.phone_num{height: 103px;}
2610	2589	}
2611	2590
2612	2591	@media only screen and (max-width:1380px){

Delete comment