From e78336f7e13965b14adcf6f982be6ed31909a08b Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Mon, 16 Oct 2023 11:19:44 +0900
Subject: [PATCH 01/26] =?UTF-8?q?=EB=B6=84=ED=95=A0=EC=A0=84=EC=86=A1=20?=
 =?UTF-8?q?=EA=B1=B4=EC=88=98=205,000=EA=B1=B4=20=EC=B4=88=EA=B3=BC?=
 =?UTF-8?q?=EC=8B=9C=2020=EA=B1=B4=EC=9C=BC=EB=A1=9C=20=EC=B4=88=EA=B8=B0?=
 =?UTF-8?q?=ED=99=94=20=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=8A=A4=ED=81=AC?=
 =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp        | 1 +
 src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp    | 1 +
 .../WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp     | 1 +
 src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp       | 1 +
 .../webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp | 1 +
 5 files changed, 5 insertions(+)

diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp
index 92a5288c..cc0c8401 100644
--- a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp
@@ -1054,6 +1054,7 @@ function checkNumber(event) {
 	var totCnt = divideCnt + "" + event.key;
 	if(Number(totCnt) > 5000){
 		alert("분할전송 건수는 5,000건을 초과할 수 없습니다.");
+		$('#frmDivideCnt').val("20");
 		return false;
 	}
   
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
index ac060175..1a9cedfa 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
@@ -3173,6 +3173,7 @@ function checkNumber(event) {
 	if(Number(totCnt) > 5000){
 		
 		alert("분할전송 건수는 5,000건을 초과할 수 없습니다.");
+		$('#divideCnt').val("20");
 		return false;
 		
 	}
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp
index 11a2ed10..b3889f41 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/excel/MsgExcelDataSMLView.jsp
@@ -2817,6 +2817,7 @@ function checkNumber(event) {
 	if(Number(totCnt) > 5000){
 		
 		alert("분할전송 건수는 5,000건을 초과할 수 없습니다.");
+		$('#divideCnt').val("20");
 		return false;
 		
 	}
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
index b7e3a66e..21a7cb5a 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -3181,6 +3181,7 @@ function checkNumber(event) {
 	if(Number(totCnt) > 5000){
 		
 		alert("분할전송 건수는 5,000건을 초과할 수 없습니다.");
+		$('#divideCnt').val("20");
 		return false;
 		
 	}
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp
index c46674a7..caebd62b 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/excel/MsgExcelDataSMLView.jsp
@@ -2901,6 +2901,7 @@ function checkNumber(event) {
 	if(Number(totCnt) > 5000){
 		
 		alert("분할전송 건수는 5,000건을 초과할 수 없습니다.");
+		$('#divideCnt').val("20");
 		return false;
 		
 	}

From 05cbc9fa0e3b4c7eda307c948a5182060e3d9415 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Mon, 16 Oct 2023 12:37:11 +0900
Subject: [PATCH 02/26] =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=9E=AC=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1=20=EA=B8=B0=EB=8A=A5=20=EC=9E=91=EC=97=85=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../msgdata/web/MjonMsgDataController.java    |  63 +++++++++
 .../jsp/web/msgdata/MsgDataSMLView.jsp        | 111 ++++------------
 .../jsp/web/msgdata/MsgSentListAjax.jsp       | 122 ++++++++++++++++++
 3 files changed, 212 insertions(+), 84 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp

diff --git a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
index 5a64c335..ede6f80f 100644
--- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
+++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
@@ -85,6 +85,8 @@ import itn.let.mjo.msgdata.service.MjonMsgDataService;
 import itn.let.mjo.msgdata.service.MjonMsgDataVO;
 import itn.let.mjo.msgdata.service.MjonMsgReturnVO;
 import itn.let.mjo.msgdata.service.PhoneVO;
+import itn.let.mjo.msgsent.service.MjonMsgSentService;
+import itn.let.mjo.msgsent.service.MjonMsgSentVO;
 import itn.let.mjo.pay.service.MjonPayService;
 import itn.let.mjo.pay.service.MjonPayVO;
 import itn.let.mjo.spammsg.service.MjonSpamMsgService;
@@ -176,6 +178,9 @@ public class MjonMsgDataController {
 	@Resource(name = "mberGrdService")
 	MberGrdService mberGrdService;
 	
+	@Resource(name = "MjonMsgSentService")
+    private MjonMsgSentService mjonMsgSentService;
+	
     private static final Logger logger = LoggerFactory.getLogger(MjonMsgDataController.class);
 	
     /**
@@ -5964,4 +5969,62 @@ public class MjonMsgDataController {
 		return modelAndView;
 	}
 	
+	/**
+	 * 문자발송 리스트 화면 불러오기
+	 *
+	 * @param MjonMsgDataVO
+	 * @param 
+	 * @param sessionVO
+	 * @param model
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value= {"/web/mjon/msgdata/selectMjMsgSentListAjax.do"})
+	public String selectMjMsgSentListAjax(
+			@ModelAttribute("searchVO") MjonMsgSentVO mjonMsgSentVO, 
+			ModelMap model) throws Exception {
+
+		//로그인 권한정보 불러오기
+    	LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
+    	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
+
+		List<MjonMsgSentVO> mjMsgSentList = null;
+		/** pageing */
+		PaginationInfo paginationInfo = new PaginationInfo();
+		
+    	if(loginVO != null) {
+	    	mjonMsgSentVO.setUserId(userId);
+	    	
+	    	// 검색 리스트 불러오기
+			if(mjonMsgSentVO.getPageUnit() != 10) {
+	    		mjonMsgSentVO.setPageUnit(mjonMsgSentVO.getPageUnit());
+	    	}
+			
+	    	//기본 내림차순 정렬
+	    	if(mjonMsgSentVO.getSearchSortOrd().equals("")) {
+	    		mjonMsgSentVO.setSearchSortOrd("desc");
+	    		mjonMsgSentVO.setSearchSortCnd("regdate");
+	    	}
+	    	
+			paginationInfo.setCurrentPageNo(mjonMsgSentVO.getPageIndex());
+			paginationInfo.setRecordCountPerPage(mjonMsgSentVO.getPageUnit());
+			paginationInfo.setPageSize(mjonMsgSentVO.getPageSize());
+	
+			mjonMsgSentVO.setFirstIndex(paginationInfo.getFirstRecordIndex());
+			mjonMsgSentVO.setLastIndex(paginationInfo.getLastRecordIndex());
+			mjonMsgSentVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
+			
+	    	//전체 발송 리스트 불러오기
+	    	mjMsgSentList = mjonMsgSentService.selectAllMsgSentList(mjonMsgSentVO);
+	    	
+	    	paginationInfo.setTotalRecordCount( mjMsgSentList.size()> 0 ? (Integer.parseInt((mjMsgSentList.get(0)).getTotMsgCnt())) : 0);
+    	}
+
+		model.addAttribute("mjMsgSentList", mjMsgSentList);
+    	model.addAttribute("paginationInfo", paginationInfo);
+    	model.addAttribute("totalRecordCount", paginationInfo.getTotalRecordCount());	    	
+		
+		return "web/msgdata/MsgSentListAjax";
+	}	
+	
 }
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
index 96b7e196..8b7a2a0d 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -3189,6 +3189,16 @@ function checkNumber(event) {
   return true;
 }
 
+//문자 발송목록(msgSentType : 01:문자전송, 02:선거문자)
+function getMjMsgSentListAll(pageNo, msgSenTType) {
+	document.sentListForm.pageIndex.value = pageNo;
+	
+	var sendData= $(document.sentListForm).serializeArray();
+	$("#mjMsgSentListAllLoad").load("/web/mjon/msgdata/selectMjMsgSentListAjax.do", sendData ,function(response, status, xhr){
+
+	});
+}
+
 </script>
 	
 	<div class="loading_layer">
@@ -3198,6 +3208,16 @@ function checkNumber(event) {
 		</div>
 	</div>
 	
+	<form id="sentListForm" name="sentListForm" method="post">
+		<input type="hidden" id="pageType" name="pageType"  value=""/>
+		<input type="hidden" id="pageIndex" name="pageIndex" value=""/>
+		<input type="hidden" id="msgGroupIdList" name="msgGroupIdList" value=""/>
+		<input type="hidden" id="tabType" name="tabType" value="all"/><!-- 탭 종류 -->
+		<input type="hidden" id="stateType" name="stateType" value="all"/><!-- 발송상태 종류 -->
+		<input type="hidden" id="listType" name="listType" value="groupList"/><!-- 리스트 종류 -->
+		<input type="hidden" id="addrGrpNm" name="addrGrpNm" value=""/><!-- 주소록 그룹 이름 -->
+	</form>
+	
 	<!-- 2023 10 16 재전송 : 상세내용 팝업 -->
 	<div class="tooltip-wrap" style="z-index:110;">
 		<div class="popup-com adr_layer rev_popup01" tabindex="0" data-tooltip-con="rev_popup01"
@@ -3246,90 +3266,13 @@ function checkNumber(event) {
 				<p><span>전송내역</p>
 				<button type="button" class="tooltip-close" data-focus="popup05-close" id="btnLatestAddPhoneClose"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
 			</div>
-			<div class="layer_in">
-				<!-- 전송내역 불러오기 -->					
-				<div class="tb_wrap" style="min-height:400px;">
-					<table class="tType4">
-						<colgroup>
-							<col style="">
-							<col style="">
-							<col style="">
-							<col style="">
-							<col style="">
-							<col style="">
-							<col style="">
-							<col style="">
-						</colgroup>
-						<thead>
-						<tr>
-							<th>발송일시
-								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
-							</th>
-							<th>형태
-								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
-							</th>
-							<th>발송방식
-								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
-							</th>
-							<th>내용</th>
-							<th>받는사람
-								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
-							</th>
-							<th>발신번호
-								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
-							</th>
-							<th>발송건수
-								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
-							</th>
-							<th>재전송 선택	</th>									
-						</tr>
-						</thead>
-						<tbody>
-							<tr>
-								<td>2023-06-10 17:50</td>
-								<td>그림</td>
-								<td>WEB</td>
-								<td><button class="btnType btnType20" data-tooltip="rev_popup01" type="button">상세보기</button></td>
-								<td>010-1547-5895 외 1명</td>
-								<td>010-5897-7895</td>
-								<td>8</td>
-								<td><button class="btnType btnType24" type="button">재전송</button></td>
-							</tr>
-							<tr>
-								<td>2023-06-10 17:50</td>
-								<td>그림</td>
-								<td>WEB</td>
-								<td><button class="btnType btnType20" data-tooltip="rev_popup01" type="button">상세보기</button></td>
-								<td>010-1547-5895 외 1명</td>
-								<td>010-5897-7895</td>
-								<td>8</td>
-								<td><button class="btnType btnType24" type="button">재전송</button></td>
-							</tr>									
-						</tbody>
-					</table>
-				</div>						
-				<!--// 전송내역 불러오기 -->					
-				<!-- pagination -->
-				<ul class="pagination">
-					<li class="page_first"><button><img src="/publish/images/content/page_first.png" alt="첫페이지"></button></li>
-					<li class="page_prev"><button><img src="/publish/images/content/page_prev.png" alt=""></button></li>
-					<li class="on"><button>1</button></li>
-					<li><button>2</button></li>
-					<li><button>3</button></li>
-					<li><button>4</button></li>
-					<li><button>5</button></li>
-					<li><button>6</button></li>
-					<li><button>7</button></li>
-					<li><button>8</button></li>
-					<li><button>9</button></li>
-					<li><button>10</button></li>
-					<li class="page_next"><button><img src="/publish/images/content/page_next.png" alt=""></button></li>
-					<li class="page_last"><button><img src="/publish/images/content/page_last.png" alt="마지막페이지"></button></li>
-				</ul><!-- pagination -->					
-				<div class="popup_btn_wrap2">
-					<button type="button" class="tooltip-close" data-focus="popup05-close"  data-focus-next="popup05">닫기</button>                      
-				</div>
+			<div class="layer_in" id="mjMsgSentListAllLoad" style="padding-bottom: 0px;">
+
 			</div>
+			
+			<div class="popup_btn_wrap2" style="margin-bottom: 30px;">
+				<button type="button" class="tooltip-close" data-focus="popup05-close"  data-focus-next="popup05">닫기</button>                      
+			</div>			
 		</div>
 	</div>
 	<!--// 2023 10 16  재전송 팝업 -->
@@ -3963,7 +3906,7 @@ function checkNumber(event) {
 												<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
 											</div>
 											<div class="btn_popup_wrap">
-												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2">재전송</button>
+												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1','01');">재전송</button>
 											</div>
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
new file mode 100644
index 00000000..7c7f47b6
--- /dev/null
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
@@ -0,0 +1,122 @@
+<%--
+  Class Name : SendNumberList.jsp
+  Description : 발신번호 리스트 조회 페이지
+  Modification Information
+
+      수정일         수정자                   수정내용
+    -------    --------    ---------------------------
+    2021.03.31    신명섭          최초 생성
+
+    Copyright (C) 2009 by ITN  All right reserved.
+--%>
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
+<%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%>
+
+<script src="/publish/js/content.js"></script>
+<script>
+$(document).ready(function(){
+	/* 목록 정렬 항목 아이콘 표시 */ 
+	var searchSortCnd = $("[name='searchSortCnd']").val();
+	var searchSortOrd = $("[name='searchSortOrd']").val();
+	if (searchSortCnd != "" && searchSortOrd != "" && searchSortCnd  != undefined && searchSortOrd  != undefined) {
+		var $sort_div = $("#sort_"+ searchSortCnd);
+		var sortClass = 'sortBtn' ;
+		if (searchSortOrd == "desc") sortClass = "sortBtnDesc";
+		$sort_div.replaceClass('sortBtn' , sortClass) ;
+		$sort_div.attr("sortOrd", searchSortOrd);
+	};
+	
+	// 정렬 항목 이벤트
+	$(".sort").click(function(e) {
+		listSortOrd(this);
+	});
+	
+	//목록 정렬 항목 클릭
+	function listSortOrd(obj){
+		var sortOrd = $(obj).attr("sortOrd");
+		var sortCnd = $(obj).attr("id");
+		 
+		$("[name='searchSortCnd']").val(sortCnd.substring(5)); // 구분자 제거
+		if (sortOrd == "desc") $("[name='searchSortOrd']").val("asc");
+		else $("[name='searchSortOrd']").val("desc");
+		payUserListAjax('1');  //각 JSP마다 다를때 메소드 정의해 줘야됨
+	};
+});
+
+</script>
+
+				<!-- 전송내역 불러오기 -->					
+				<div class="tb_wrap" style="min-height:400px;">
+					<table class="tType4">
+						<colgroup>
+							<col style="">
+							<col style="">
+							<col style="">
+							<col style="">
+							<col style="">
+							<col style="">
+							<col style="">
+							<col style="">
+						</colgroup>
+						<thead>
+						<tr>
+							<th>발송일시
+								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
+							</th>
+							<th>형태
+								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
+							</th>
+							<th>발송방식
+								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
+							</th>
+							<th>내용</th>
+							<th>받는사람
+								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
+							</th>
+							<th>발신번호
+								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
+							</th>
+							<th>발송건수
+								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
+							</th>
+							<th>재전송 선택	</th>									
+						</tr>
+						</thead>
+						<tbody>
+							<tr>
+								<td>2023-06-10 17:50</td>
+								<td>그림</td>
+								<td>WEB</td>
+								<td><button class="btnType btnType20" data-tooltip="rev_popup01" type="button">상세보기</button></td>
+								<td>010-1547-5895 외 1명</td>
+								<td>010-5897-7895</td>
+								<td>8</td>
+								<td><button class="btnType btnType24" type="button">재전송</button></td>
+							</tr>
+							<tr>
+								<td>2023-06-10 17:50</td>
+								<td>그림</td>
+								<td>WEB</td>
+								<td><button class="btnType btnType20" data-tooltip="rev_popup01" type="button">상세보기</button></td>
+								<td>010-1547-5895 외 1명</td>
+								<td>010-5897-7895</td>
+								<td>8</td>
+								<td><button class="btnType btnType24" type="button">재전송</button></td>
+							</tr>									
+						</tbody>
+					</table>
+				</div>						
+				<!--// 전송내역 불러오기 -->			
+
+				<!-- pagination -->
+				<c:if test="${!empty mjMsgSentList}">
+					<ul class="pagination">
+						<ui:pagination paginationInfo = "${paginationInfo}"  type="imageWeb" jsFunction="getMjMsgSentListAll" />
+					</ul>
+				</c:if>
+				<!-- pagination -->

From 15c2c5727f31daf7e3b2b7d0853faa40fa5bbde9 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Mon, 16 Oct 2023 12:51:01 +0900
Subject: [PATCH 03/26] =?UTF-8?q?=EC=9E=AC=EC=A0=84=EC=86=A1=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
index 8b7a2a0d..ffc22260 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -3905,9 +3905,11 @@ function getMjMsgSentListAll(pageNo, msgSenTType) {
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
 											</div>
+											<%--
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1','01');">재전송</button>
 											</div>
+											 --%>
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
 												<div class="error_hover_cont send_hover_cont">

From 91bf9d0175b8fdaa34ed61405c617e002acaaf10 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Mon, 16 Oct 2023 15:15:35 +0900
Subject: [PATCH 04/26] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EC=9E=AC=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1=20=EC=9E=91=EC=97=85=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../msgdata/web/MjonMsgDataController.java    |   2 +
 .../jsp/web/msgdata/MsgDataSMLView.jsp        |  44 +---
 .../jsp/web/msgdata/MsgSentListAjax.jsp       | 208 ++++++++++++++----
 3 files changed, 171 insertions(+), 83 deletions(-)

diff --git a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
index ede6f80f..f934df87 100644
--- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
+++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
@@ -5993,6 +5993,8 @@ public class MjonMsgDataController {
 		PaginationInfo paginationInfo = new PaginationInfo();
 		
     	if(loginVO != null) {
+	    	mjonMsgSentVO.setStateType("all");
+	    	mjonMsgSentVO.setListType("groupList");
 	    	mjonMsgSentVO.setUserId(userId);
 	    	
 	    	// 검색 리스트 불러오기
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
index ffc22260..edb7ca97 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -3190,7 +3190,7 @@ function checkNumber(event) {
 }
 
 //문자 발송목록(msgSentType : 01:문자전송, 02:선거문자)
-function getMjMsgSentListAll(pageNo, msgSenTType) {
+function getMjMsgSentListAll(pageNo, msgSentType) {
 	document.sentListForm.pageIndex.value = pageNo;
 	
 	var sendData= $(document.sentListForm).serializeArray();
@@ -3211,11 +3211,6 @@ function getMjMsgSentListAll(pageNo, msgSenTType) {
 	<form id="sentListForm" name="sentListForm" method="post">
 		<input type="hidden" id="pageType" name="pageType"  value=""/>
 		<input type="hidden" id="pageIndex" name="pageIndex" value=""/>
-		<input type="hidden" id="msgGroupIdList" name="msgGroupIdList" value=""/>
-		<input type="hidden" id="tabType" name="tabType" value="all"/><!-- 탭 종류 -->
-		<input type="hidden" id="stateType" name="stateType" value="all"/><!-- 발송상태 종류 -->
-		<input type="hidden" id="listType" name="listType" value="groupList"/><!-- 리스트 종류 -->
-		<input type="hidden" id="addrGrpNm" name="addrGrpNm" value=""/><!-- 주소록 그룹 이름 -->
 	</form>
 	
 	<!-- 2023 10 16 재전송 : 상세내용 팝업 -->
@@ -3227,33 +3222,10 @@ function getMjMsgSentListAll(pageNo, msgSenTType) {
 				<button type="button" class="tooltip-close" data-focus="rev_popup01-close"><img
 						src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
 			</div>
-			<div class="layer_in">
-				<div class="rev_pop_in">
-					<div class="rev_pop_middle clearfix">
-						<span>발송일시 : 2021-05-28 16:52:30</span>
-						<span class="msg_com msg_photo">MMS</span>
-						<!--  장문, 단문 일때 
-						<span class="msg_com msg_long">LMS</span>
-						<span class="msg_com msg_short">SMS</span>-->
-					</div>
-					<div class="rev_pop_txt">
-						<ul>
-							<li><img src="/publish/images/content/thumb1.jpg" alt="발송된 그림문자 미리보기"></li>
-							<li><img src="/publish/images/content/thumb2.jpg" alt="발송된 그림문자 미리보기"></li>
-							<li><img src="/publish/images/content/thumb3.jpg" alt="발송된 그림문자 미리보기"></li>
-						</ul>
-						<div>
-							<p class="deny_receipt">(광고) 무료거부 080-888-8282</p>
-							<p class="rev_cont">안녕하세요. 문자온미용실 입니다.<br>
-								여름 맞이 이벤트 입니다.<br>
-								7월부터 8월까지 모든 염색 10만원(시세이도 및 탈색은 별도)
-							</p>
-						</div>
-					</div>
-				</div>
-				<div class="popup_btn_wrap2" style="justify-content: center;">
-					<button type="button" class="tooltip-close" data-focus="rev_popup01-close" data-focus-next="rev_popup01">닫기</button>
-				</div>
+			<div class="layer_in" id="msgSentDetailPopLoad" style="padding-bottom: 0px;">
+			</div>
+			<div class="popup_btn_wrap2" style="justify-content: center; margin-bottom: 30px;">
+				<button type="button" class="tooltip-close" data-focus="rev_popup01-close" data-focus-next="rev_popup01">닫기</button>
 			</div>
 		</div>
 	</div>
@@ -3266,10 +3238,8 @@ function getMjMsgSentListAll(pageNo, msgSenTType) {
 				<p><span>전송내역</p>
 				<button type="button" class="tooltip-close" data-focus="popup05-close" id="btnLatestAddPhoneClose"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
 			</div>
-			<div class="layer_in" id="mjMsgSentListAllLoad" style="padding-bottom: 0px;">
-
+			<div class="layer_in" id="mjMsgSentListAllLoad" style="padding-bottom: 0px; min-height:428px;">
 			</div>
-			
 			<div class="popup_btn_wrap2" style="margin-bottom: 30px;">
 				<button type="button" class="tooltip-close" data-focus="popup05-close"  data-focus-next="popup05">닫기</button>                      
 			</div>			
@@ -3909,7 +3879,7 @@ function getMjMsgSentListAll(pageNo, msgSenTType) {
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1','01');">재전송</button>
 											</div>
-											 --%>
+											--%>
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
 												<div class="error_hover_cont send_hover_cont">
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
index 7c7f47b6..fedb83ac 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
@@ -44,70 +44,184 @@ $(document).ready(function(){
 		$("[name='searchSortCnd']").val(sortCnd.substring(5)); // 구분자 제거
 		if (sortOrd == "desc") $("[name='searchSortOrd']").val("asc");
 		else $("[name='searchSortOrd']").val("desc");
-		payUserListAjax('1');  //각 JSP마다 다를때 메소드 정의해 줘야됨
+		getMjMsgSentListAll('1');  //각 JSP마다 다를때 메소드 정의해 줘야됨
 	};
 });
 
+//문자 재전송
+function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) {
+	if (replaceCnt > 0) {
+		alert("치환문자는 재전송 불가합니다.");
+	}
+	else {
+		var title = "";
+		if (electionCnt > 0) {
+			title = "선거문자발송";
+		}
+		else {
+			title = "문자발송";
+		}
+		
+	    //if (confirm(title + " 화면으로 이동합니다.\n문자내용, 받는사람 확인후 발송해주세요.")) {
+	    if (confirm("문자내용, 받는사람 확인후 발송해주세요.")) {
+			var form = document.reSendAllForm;
+			form.msgResendAllFlag.value = "Y";
+			form.msgResendAllGroupId.value = msgGroupId;
+			if (electionCnt > 0) {
+				form.action="/web/mjon/msgcampain/selectMsgDataView.do";
+			}
+			else {
+				if (advertisementCnt > 0) {
+					// 광고문자
+					form.msgResendAllAdvertiseYn.value = "Y";
+				}
+				form.action="/web/mjon/msgdata/selectMsgDataView.do";
+			}
+			form.submit();		
+	    }
+	}
+}
+
+//상세보기 버튼 실행
+function fnRevDetailPop(msgGroupId, msgId, fileCnt){
+	document.resPopForm.msgGroupId.value = msgGroupId;
+	document.resPopForm.msgId.value = msgId;
+	var sendData =  $(document.resPopForm).serializeArray();
+	
+	var form = document.searchForm;
+	$("#msgSentDetailPopLoad").load("/web/mjon/msgsent/selectMsgSentDetailDataAjax.do", sendData ,function(response, status, xhr){
+	});		
+}
+
 </script>
 
+	<form id="resPopForm" name="resPopForm" method="post">
+		<input type="hidden" id="msgGroupId" name="msgGroupId" value=""/>
+		<input type="hidden" id="msgId" name="msgId" value=""/>
+		<input type="hidden" id="fileCnt" name="fileCnt" value=""/>
+		<input type="hidden" id="resultType" name="resultType" value="S"/>
+	</form>
+	<form name="reSendAllForm" method="post">
+		<input type="hidden" name="msgResendAllFlag" value="N"/>
+		<input type="hidden" name="msgResendAllGroupId" value=""/>
+		<input type="hidden" name="msgResendAllAdvertiseYn" value="N"/>		
+	</form>
+	
 				<!-- 전송내역 불러오기 -->					
-				<div class="tb_wrap" style="min-height:400px;">
+				<div class="tb_wrap" style="min-height:428px;">
 					<table class="tType4">
 						<colgroup>
-							<col style="">
-							<col style="">
-							<col style="">
-							<col style="">
-							<col style="">
-							<col style="">
-							<col style="">
-							<col style="">
+							<col style="width: 13%;">
+							<col style="width: 8%;">
+							<col style="width: 9%;">
+							<col style="width: 12%;">
+							<col style="width: *%;">
+							<col style="width: 12%;">
+							<col style="width: 9%;">
+							<col style="width: 12%;">
 						</colgroup>
 						<thead>
 						<tr>
-							<th>발송일시
-								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
-							</th>
-							<th>형태
-								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
-							</th>
-							<th>발송방식
-								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
-							</th>
+							<th>발송일시</th>
+							<th>형태</th>
+							<th>발송방식</th>
 							<th>내용</th>
-							<th>받는사람
-								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
-							</th>
-							<th>발신번호
-								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
-							</th>
-							<th>발송건수
-								<div class="sort_wrap"><button type="button"><img src="/publish/images/sortUp.png" alt="오름차순으로 분류"></button><button type="button"><img src="/publish/images/sortDown.png" alt="내림차순으로 분류"></button></div>
-							</th>
+							<th>받는사람</th>
+							<th>발신번호</th>
+							<th>발송건수</th>
 							<th>재전송 선택	</th>									
 						</tr>
 						</thead>
 						<tbody>
+						<c:choose>
+							<c:when test="${not empty mjMsgSentList}">
+							<c:forEach var="result" items="${mjMsgSentList}" varStatus="status">	
+								<c:set var="replaceCnt" value="0" />
+								<c:set var="electionCnt" value="0" />
+								<c:set var="advertisementCnt" value="0" />		
+		
+								<c:if test="${fn:indexOf(result.smsTxt,'[*이름*]') != -1 || fn:indexOf(result.smsTxt,'[*1*]') != -1 || fn:indexOf(result.smsTxt,'[*2*]') != -1 || fn:indexOf(result.smsTxt,'[*3*]') != -1 || fn:indexOf(result.smsTxt,'[*4*]') != -1}">
+									<c:set var="replaceCnt" value="1" />
+								</c:if>
+								<c:if test="${fn:indexOf(result.smsTxt,'(선거운동정보)') == 0}">
+									<c:set var="electionCnt" value="1" />
+								</c:if>					
+								<c:if test="${fn:indexOf(result.smsTxt,'(광고)') == 0}">
+									<c:set var="advertisementCnt" value="1" />
+								</c:if>	
+								<tr>
+									<td>
+										<fmt:formatDate pattern = "yyyy-MM-dd HH:mm" value = "${result.reqdate}" />
+									</td>
+									<td>
+										<c:choose>
+											<c:when test="${result.msgType eq '6' && result.fileCnt eq 0 }">
+												장문
+											</c:when>
+											<c:when test="${result.msgType eq '6' && result.fileCnt ne 0 }">
+												그림
+											</c:when>
+											<c:otherwise>
+												단문
+											</c:otherwise>
+										</c:choose>
+									</td>
+									<td>
+										<c:choose>
+											<c:when test="${result.sendKind eq 'H' }">
+												WEB
+											</c:when>
+											<c:when test="${result.sendKind eq 'A'}">
+												API
+											</c:when>
+											<c:otherwise>
+												-
+											</c:otherwise>
+										</c:choose>
+									</td>
+									<td>
+										<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${result.msgGroupId}','${result.msgId}','${result.fileCnt}'); return false;">상세보기</button>										
+									</td>
+									<td>
+										<c:choose>
+											<c:when test="${result.msgGroupCnt > 1}">
+												<p>
+													<c:choose>
+														<c:when test="${result.addrNm ne '-' and result.addrNm ne ''}">
+															<c:out value="${result.addrNm}"/>
+														</c:when>
+														<c:otherwise>
+															<c:out value="${result.callToComma}"/>
+														</c:otherwise>
+													</c:choose> 외 <fmt:formatNumber value="${result.msgGroupCnt - 1}" pattern="#,###"/>명
+												</p>	
+											</c:when>
+											<c:when test="${result.addrNm ne '-' and result.addrNm ne ''}">
+												<p><c:out value="${result.addrNm}"/></p>
+											</c:when>
+											<c:otherwise>
+												<p><c:out value="${result.callToComma}"/></p>
+											</c:otherwise>
+										</c:choose>
+									</td>
+									<td>
+										<c:out value="${result.callFromComma}"/>								
+									</td>
+									<td>
+										<c:out value="${result.msgGroupCnt}"/>
+									</td>
+									<td>
+										<button class="btnType btnType24" onClick="javascript:fnMjMsgReSendAll('${result.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>								
+									</td>
+								</tr>
+							</c:forEach>
+							</c:when>
+							<c:otherwise>
 							<tr>
-								<td>2023-06-10 17:50</td>
-								<td>그림</td>
-								<td>WEB</td>
-								<td><button class="btnType btnType20" data-tooltip="rev_popup01" type="button">상세보기</button></td>
-								<td>010-1547-5895 외 1명</td>
-								<td>010-5897-7895</td>
-								<td>8</td>
-								<td><button class="btnType btnType24" type="button">재전송</button></td>
+								<td colspan="8">발송 내역이 없습니다.</td>
 							</tr>
-							<tr>
-								<td>2023-06-10 17:50</td>
-								<td>그림</td>
-								<td>WEB</td>
-								<td><button class="btnType btnType20" data-tooltip="rev_popup01" type="button">상세보기</button></td>
-								<td>010-1547-5895 외 1명</td>
-								<td>010-5897-7895</td>
-								<td>8</td>
-								<td><button class="btnType btnType24" type="button">재전송</button></td>
-							</tr>									
+							</c:otherwise>
+						</c:choose>							
 						</tbody>
 					</table>
 				</div>						
@@ -120,3 +234,5 @@ $(document).ready(function(){
 					</ul>
 				</c:if>
 				<!-- pagination -->
+
+				
\ No newline at end of file

From da9899ed7e532f094069293b161ac416c1f41abc Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Mon, 16 Oct 2023 17:00:48 +0900
Subject: [PATCH 05/26] =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC=20?=
 =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=83=81=EC=84=B8=EB=B3=B4=EA=B8=B0=20?=
 =?UTF-8?q?=EB=8B=AB=EA=B8=B0=EB=B2=84=ED=8A=BC=20=EB=85=B8=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/web/msgsent/MsgSentSFDetailListAjax.jsp  | 9 +++++----
 src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp  | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentSFDetailListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentSFDetailListAjax.jsp
index bb48c9d4..1c9df99f 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentSFDetailListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentSFDetailListAjax.jsp
@@ -95,13 +95,14 @@ function linkPage(pageNo){
 				<p>문자내용</p>
 				<button type="button" class="tooltip-close" data-focus="rev_popup01-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
 			</div>
-			<div class="layer_in" id="msgSentDetailPopLoad">
-                <div class="popup_btn_wrap2" style="justify-content: center;">
-                    <button type="button" class="tooltip-close" data-focus="rev_popup01-close" data-focus-next="rev_popup01">닫기</button>                      
-                </div>
+			<div class="layer_in" id="msgSentDetailPopLoad" style="padding-bottom: 0px;">
 			</div>
+            <div class="popup_btn_wrap2" style="justify-content: center; margin-bottom: 30px;">
+                <button type="button" class="tooltip-close" data-focus="rev_popup01-close" data-focus-next="rev_popup01">닫기</button>                      
+            </div>			
 		</div>
 	</div><!--// 문자내용 팝업 -->
+	
 	<div class="tablePrint_wrap" style="width:1200px;">
 	    <div class="list_info">
 	        <p>총 <span class="c_e40000"><c:out value="${totalRecordCount}"/></span>건</p>
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
index 40743e55..e2051241 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
@@ -746,11 +746,11 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt)
 				<p>문자내용</p>
 				<button type="button" class="tooltip-close" data-focus="rev_popup01-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
 			</div>
-			<div class="layer_in" id="msgSentDetailPopLoad">
-				<div class="popup_btn_wrap2" style="justify-content: center;">
-					<button type="button" class="tooltip-close" data-focus="rev_popup01-close" data-focus-next="rev_popup01">닫기</button>                      
-				</div>
+			<div class="layer_in" id="msgSentDetailPopLoad" style="padding-bottom: 0px;">
 			</div>
+			<div class="popup_btn_wrap2" style="justify-content: center; margin-bottom: 30px;">
+				<button type="button" class="tooltip-close" data-focus="rev_popup01-close" data-focus-next="rev_popup01">닫기</button>                      
+			</div>			
 		</div>
 	</div><!--// 문자내용 팝업 -->
 	<!-- 그룹등록 팝업 data-tooltip:rev_popup02 -->

From 7c205e4922818dd995ae1215de486fdabec7018b Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Tue, 17 Oct 2023 10:58:34 +0900
Subject: [PATCH 06/26] =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=9E=AC=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1=20=EA=B8=B0=EB=8A=A5=20=EC=9E=91=EC=97=85=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mjo/msgsent/service/MjonMsgSentVO.java    |  9 ++-
 .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml  | 10 ++-
 .../jsp/web/msgcampain/MsgDataSMLView.jsp     | 58 +++++++++++++++
 .../jsp/web/msgdata/MsgDataSMLView.jsp        | 19 ++---
 .../jsp/web/msgdata/MsgSentListAjax.jsp       | 72 +++++++++++++------
 .../jsp/web/msgsent/MsgSentAllListAjax.jsp    |  2 +-
 .../WEB-INF/jsp/web/msgsent/MsgSentView.jsp   |  2 -
 src/main/webapp/publish/js/popupLayer.js      |  4 +-
 8 files changed, 142 insertions(+), 34 deletions(-)

diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
index 1e84512a..eb74a5d5 100644
--- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
+++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
@@ -81,7 +81,14 @@ public class MjonMsgSentVO extends UserDefaultVO{
 
 	private String callFromComma;
 	private String callToComma;
-
+	private String msgSentType;
+	
+	public String getMsgSentType() {
+		return msgSentType;
+	}
+	public void setMsgSentType(String msgSentType) {
+		this.msgSentType = msgSentType;
+	}
 	public String getCallFromComma() {
 		return callFromComma;
 	}
diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
index dc2e2342..344c5a3b 100644
--- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
@@ -411,8 +411,16 @@
 					AND 	DATE_FORMAT(REGDATE, '%Y-%m-%d')  <=  DATE_FORMAT(#endDate#, '%Y-%m-%d')  
 				]]>
 			</isNotEmpty>
+			<isNotEmpty property="msgSentType">
+				<isEqual property="msgSentType" compareValue="01" >
+					AND SUBSTR(SMS_TXT, 1, 8) != '(선거운동정보)'
+				</isEqual>
+				<isEqual property="msgSentType" compareValue="02" >
+					AND SUBSTR(SMS_TXT, 1, 8) = '(선거운동정보)'
+				</isEqual>
+			</isNotEmpty>
 		GROUP BY MSG_GROUP_ID
-		ORDER BY 1=1, MSG_GROUP_ID DESC
+		ORDER BY 1=1
 		<isNotEmpty property="searchSortCnd">
 			<isEqual property="searchSortCnd" compareValue="curState">
 				, curState  $searchSortOrd$
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
index 1a9cedfa..29ce9b75 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
@@ -3181,6 +3181,17 @@ function checkNumber(event) {
   return true;
 }
 
+//문자 발송목록
+function getMjMsgSentListAll(pageNo) {
+	document.sentListForm.pageIndex.value = pageNo;
+	document.sentListForm.msgSentType.value = "02";		// 01:문자전송, 02:선거문자
+	
+	var sendData= $(document.sentListForm).serializeArray();
+	$("#mjMsgSentListAllLoad").load("/web/mjon/msgdata/selectMjMsgSentListAjax.do", sendData ,function(response, status, xhr){
+
+	});
+}
+
 </script>
 	<div class="loading_layer">
 		<div class="loading_container">
@@ -3189,6 +3200,48 @@ function checkNumber(event) {
 		</div>
 	</div>
 
+	<form id="sentListForm" name="sentListForm" method="post">
+		<input type="hidden" name="pageType"  value=""/>
+		<input type="hidden" name="pageIndex" value=""/>
+		<input type="hidden" name="msgSentType" value=""/>
+		<input type="hidden" name="searchSortCnd" value="" />
+		<input type="hidden" name="searchSortOrd" value="" />		
+	</form>
+	
+	<!-- 2023 10 16 재전송 : 상세내용 팝업 -->
+	<div class="tooltip-wrap" style="z-index:110;">
+		<div class="popup-com adr_layer rev_popup01" tabindex="0" data-tooltip-con="rev_popup01"
+			data-focus="rev_popup01" data-focus-prev="rev_popup01-close" style="width: 440px;">
+			<div class="popup_heading">
+				<p>문자내용</p>
+				<button type="button" class="tooltip-close" data-focus="rev_popup01-close"><img
+						src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
+			</div>
+			<div class="layer_in" id="msgSentDetailPopLoad" style="padding-bottom: 0px;">
+			</div>
+			<div class="popup_btn_wrap2" style="justify-content: center; margin-bottom: 30px;">
+				<button type="button" class="tooltip-close" data-focus="rev_popup01-close" data-focus-next="rev_popup01">닫기</button>
+			</div>
+		</div>
+	</div>
+	<!--// 2023 10 16  재전송 : 상세내용 팝업 -->	
+	
+	<!-- 2023 10 16  재전송 팝업 -->  
+	<div class="tooltip-wrap">
+		<div class="popup-com import_layer popup05" tabindex="0" data-tooltip-con="popup05" data-focus="popup05" data-focus-prev="popup05-close" style="width: 900px;">
+			<div class="popup_heading">
+				<p><span>전송내역</p>
+				<button type="button" class="tooltip-close" data-focus="popup05-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
+			</div>
+			<div class="layer_in" id="mjMsgSentListAllLoad" style="padding-bottom: 0px; min-height:428px;">
+			</div>
+			<div class="popup_btn_wrap2" style="margin-bottom: 30px;">
+				<button type="button" class="tooltip-close" data-focus="popup05-close"  data-focus-next="popup05">닫기</button>                      
+			</div>			
+		</div>
+	</div>
+	<!--// 2023 10 16  재전송 팝업 -->
+	
 	<!-- 후보자등록 팝업 data-tooltip:candidate_popup01 -->
 	<div class="tooltip-wrap">
 		<div class="popup-com candidate_layer candidate_popup01" tabindex="0" data-tooltip-con="candidate_popup01" data-focus="candidate_popup01" data-focus-prev="candidate_popup01-close" style="width: 620px;">
@@ -4025,6 +4078,11 @@ function checkNumber(event) {
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
 											</div>
+											<%--
+											<div class="btn_popup_wrap">
+												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
+											</div>
+											--%>											
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
 												<div class="error_hover_cont send_hover_cont">
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
index edb7ca97..367d5f93 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -3189,9 +3189,10 @@ function checkNumber(event) {
   return true;
 }
 
-//문자 발송목록(msgSentType : 01:문자전송, 02:선거문자)
-function getMjMsgSentListAll(pageNo, msgSentType) {
+//문자 발송목록
+function getMjMsgSentListAll(pageNo) {
 	document.sentListForm.pageIndex.value = pageNo;
+	document.sentListForm.msgSentType.value = "01";		// 01:문자전송, 02:선거문자
 	
 	var sendData= $(document.sentListForm).serializeArray();
 	$("#mjMsgSentListAllLoad").load("/web/mjon/msgdata/selectMjMsgSentListAjax.do", sendData ,function(response, status, xhr){
@@ -3209,8 +3210,11 @@ function getMjMsgSentListAll(pageNo, msgSentType) {
 	</div>
 	
 	<form id="sentListForm" name="sentListForm" method="post">
-		<input type="hidden" id="pageType" name="pageType"  value=""/>
-		<input type="hidden" id="pageIndex" name="pageIndex" value=""/>
+		<input type="hidden" name="pageType"  value=""/>
+		<input type="hidden" name="pageIndex" value=""/>
+		<input type="hidden" name="msgSentType" value=""/>
+		<input type="hidden" name="searchSortCnd" value="" />
+		<input type="hidden" name="searchSortOrd" value="" />		
 	</form>
 	
 	<!-- 2023 10 16 재전송 : 상세내용 팝업 -->
@@ -3233,10 +3237,10 @@ function getMjMsgSentListAll(pageNo, msgSentType) {
 	
 	<!-- 2023 10 16  재전송 팝업 -->  
 	<div class="tooltip-wrap">
-		<div class="popup-com import_layer popup05" tabindex="0" data-tooltip-con="popup05" data-focus="popup05" data-focus-prev="popup05-close">
+		<div class="popup-com import_layer popup05" tabindex="0" data-tooltip-con="popup05" data-focus="popup05" data-focus-prev="popup05-close" style="width: 900px;">
 			<div class="popup_heading">
 				<p><span>전송내역</p>
-				<button type="button" class="tooltip-close" data-focus="popup05-close" id="btnLatestAddPhoneClose"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
+				<button type="button" class="tooltip-close" data-focus="popup05-close"><img src="/publish/images/content/layerPopup_close.png" alt="팝업 닫기"></button>
 			</div>
 			<div class="layer_in" id="mjMsgSentListAllLoad" style="padding-bottom: 0px; min-height:428px;">
 			</div>
@@ -3246,7 +3250,6 @@ function getMjMsgSentListAll(pageNo, msgSentType) {
 		</div>
 	</div>
 	<!--// 2023 10 16  재전송 팝업 -->
-	
 
 	<div class="tooltip-wrap">
 		<div class="popup-com history_layer popup03" tabindex="0" data-tooltip-con="popup03" data-focus="popup03" data-focus-prev="popup03-close">
@@ -3877,7 +3880,7 @@ function getMjMsgSentListAll(pageNo, msgSentType) {
 											</div>
 											<%--
 											<div class="btn_popup_wrap">
-												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1','01');">재전송</button>
+												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
 											</div>
 											--%>
 											<div class="btn_popup_wrap check_validity_wrap">
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
index fedb83ac..7b2c1867 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
@@ -21,31 +21,39 @@
 <script>
 $(document).ready(function(){
 	/* 목록 정렬 항목 아이콘 표시 */ 
-	var searchSortCnd = $("[name='searchSortCnd']").val();
-	var searchSortOrd = $("[name='searchSortOrd']").val();
+	var searchSortCnd = "${searchVO.searchSortCnd}";
+	var searchSortOrd = "${searchVO.searchSortOrd}";
 	if (searchSortCnd != "" && searchSortOrd != "" && searchSortCnd  != undefined && searchSortOrd  != undefined) {
 		var $sort_div = $("#sort_"+ searchSortCnd);
 		var sortClass = 'sortBtn' ;
 		if (searchSortOrd == "desc") sortClass = "sortBtnDesc";
 		$sort_div.replaceClass('sortBtn' , sortClass) ;
 		$sort_div.attr("sortOrd", searchSortOrd);
-	};
-	
+	}
+
 	// 정렬 항목 이벤트
 	$(".sort").click(function(e) {
 		listSortOrd(this);
 	});
-	
+
 	//목록 정렬 항목 클릭
 	function listSortOrd(obj){
 		var sortOrd = $(obj).attr("sortOrd");
 		var sortCnd = $(obj).attr("id");
 		 
-		$("[name='searchSortCnd']").val(sortCnd.substring(5)); // 구분자 제거
-		if (sortOrd == "desc") $("[name='searchSortOrd']").val("asc");
-		else $("[name='searchSortOrd']").val("desc");
+		sortCnd = sortCnd.substring(5); // 구분자 제거
+		if (sortOrd == "desc") {
+			sortOrd = "asc";
+		}
+		else {
+			sortOrd = "desc";
+		}
+		
+		document.sentListForm.searchSortCnd.value = sortCnd;
+		document.sentListForm.searchSortOrd.value = sortOrd;
 		getMjMsgSentListAll('1');  //각 JSP마다 다를때 메소드 정의해 줘야됨
-	};
+	}
+
 });
 
 //문자 재전송
@@ -111,24 +119,48 @@ function fnRevDetailPop(msgGroupId, msgId, fileCnt){
 				<div class="tb_wrap" style="min-height:428px;">
 					<table class="tType4">
 						<colgroup>
-							<col style="width: 13%;">
-							<col style="width: 8%;">
-							<col style="width: 9%;">
-							<col style="width: 12%;">
+							<col style="width: 17%;">
+							<col style="width: 7%;">
+							<col style="width: 7%;">
+							<col style="width: 11%;">
 							<col style="width: *%;">
-							<col style="width: 12%;">
+							<col style="width: 15%;">
 							<col style="width: 9%;">
 							<col style="width: 12%;">
 						</colgroup>
 						<thead>
 						<tr>
-							<th>발송일시</th>
-							<th>형태</th>
-							<th>발송방식</th>
+							<th>발송일시
+								<div class="sort_wrap">
+									<input type="button" class="sort sortBtn" id="sort_reqdate">
+								</div>							
+							</th>
+							<th>형태
+								<div class="sort_wrap">
+									<input type="button" class="sort sortBtn" id="sort_orderByCode">
+								</div>							
+							</th>
+							<th>방식
+								<div class="sort_wrap">
+									<input type="button" class="sort sortBtn" id="sort_sendKind">
+								</div>							
+							</th>
 							<th>내용</th>
-							<th>받는사람</th>
-							<th>발신번호</th>
-							<th>발송건수</th>
+							<th>받는사람
+								<div class="sort_wrap">
+									<input type="button" class="sort sortBtn" id="sort_callTo">
+								</div>							
+							</th>
+							<th>발신번호
+								<div class="sort_wrap">
+									<input type="button" class="sort sortBtn" id="sort_callFrom">
+								</div>							
+							</th>
+							<th>건수
+								<div class="sort_wrap">
+									<input type="button" class="sort sortBtn" id="sort_msgGroupCnt">
+								</div>							
+							</th>
 							<th>재전송 선택	</th>									
 						</tr>
 						</thead>
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
index c956704b..f4189ea7 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
@@ -101,7 +101,7 @@ $(document).ready(function(){
 					</th>
 					<th>형태
 						<div class="sort_wrap">
-							<input type="button" class="sort sortBtn" id="sort_msgType">
+							<input type="button" class="sort sortBtn" id="sort_orderByCode">
 						</div>
 					</th>
 					<th>발송방식
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
index e2051241..aac6f6f8 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
@@ -4,8 +4,6 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@ page import="itn.com.cmm.LoginVO" %>
-<!-- <script src="/publish/js/content.js"></script> -->
-<script src="/publish/js/popupLayer.js"></script>
 
 <script type="text/javascript">
 
diff --git a/src/main/webapp/publish/js/popupLayer.js b/src/main/webapp/publish/js/popupLayer.js
index 553ef073..a2b45d81 100644
--- a/src/main/webapp/publish/js/popupLayer.js
+++ b/src/main/webapp/publish/js/popupLayer.js
@@ -44,7 +44,9 @@ function tooltip() {
 	function close(t) {
 		var activeTarget = $('[data-tooltip-con="' + t + '"]');
 		activeTarget.hide().css('opacity','0');
-		$('[data-tooltip="' + t + '"]').focus();
+		if (t != "rev_popup01") {
+			$('[data-tooltip="' + t + '"]').focus();	
+		}
 	}
 	
 

From 875aad3696374c7f80b2835291beea858d02cf9e Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Tue, 17 Oct 2023 12:23:37 +0900
Subject: [PATCH 07/26] =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=9E=AC=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1=20=EC=B9=98=ED=99=98=EB=AC=B8=EC=9E=90=20=EA=B4=80?=
 =?UTF-8?q?=EB=A0=A8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/MjonMsgCampainDataController.java     |  1 +
 .../mjo/msgdata/service/MjonMsgDataVO.java    |  7 +++++
 .../msgdata/web/MjonMsgDataController.java    |  1 +
 .../jsp/web/msgcampain/MsgDataView.jsp        |  7 +++--
 .../WEB-INF/jsp/web/msgdata/MsgDataView.jsp   |  7 +++--
 .../jsp/web/msgdata/MsgSentListAjax.jsp       | 30 ++++++++++++++-----
 .../WEB-INF/jsp/web/msgsent/MsgSentView.jsp   | 26 ++++++++++++----
 7 files changed, 63 insertions(+), 16 deletions(-)

diff --git a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java
index 4445266a..84bb44af 100644
--- a/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java
+++ b/src/main/java/itn/let/mjo/msgcampain/web/MjonMsgCampainDataController.java
@@ -283,6 +283,7 @@ public class MjonMsgCampainDataController {
 		model.addAttribute("msgResendAllFlag", searchVO.getMsgResendAllFlag());
 		model.addAttribute("msgResendAllGroupId", searchVO.getMsgResendAllGroupId());
 		model.addAttribute("msgResendAllAdvertiseYn", searchVO.getMsgResendAllAdvertiseYn());
+		model.addAttribute("msgResendAllReplaceYn", searchVO.getMsgResendAllReplaceYn());
 		
 		return "web/msgcampain/MsgDataView";
 	}
diff --git a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java
index d4039d1c..10c9854a 100644
--- a/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java
+++ b/src/main/java/itn/let/mjo/msgdata/service/MjonMsgDataVO.java
@@ -70,8 +70,15 @@ public class MjonMsgDataVO  extends UserDefaultVO{
 	private String msgResendAllFlag;
 	private String msgResendAllGroupId;
 	private String msgResendAllAdvertiseYn;		
+	private String msgResendAllReplaceYn;
 	private String atchFiles;
 	
+	public String getMsgResendAllReplaceYn() {
+		return msgResendAllReplaceYn;
+	}
+	public void setMsgResendAllReplaceYn(String msgResendAllReplaceYn) {
+		this.msgResendAllReplaceYn = msgResendAllReplaceYn;
+	}
 	public String getAtchFiles() {
 		return atchFiles;
 	}
diff --git a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
index f934df87..f3509014 100644
--- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
+++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
@@ -407,6 +407,7 @@ public class MjonMsgDataController {
 			model.addAttribute("msgResendAllFlag", searchVO.getMsgResendAllFlag());
 			model.addAttribute("msgResendAllGroupId", searchVO.getMsgResendAllGroupId());
 			model.addAttribute("msgResendAllAdvertiseYn", searchVO.getMsgResendAllAdvertiseYn());
+			model.addAttribute("msgResendAllReplaceYn", searchVO.getMsgResendAllReplaceYn());
 			
 		}catch(Exception ex) {
 			ex.printStackTrace();
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp
index 52857c12..0f020252 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp
@@ -23,6 +23,7 @@ var popCustomScrT=0;	// 맞춤제작 요청 JSPark => 2023.02.21 추가
 var msgResendAllFlag = "${msgResendAllFlag}";
 var msgResendAllGroupId = "${msgResendAllGroupId}";
 var msgResendAllAdvertiseYn = "${msgResendAllAdvertiseYn}";
+var msgResendAllReplaceYn = "${msgResendAllReplaceYn}";
 
 $(document).ready(function(){
 	//문자 발송 화면 폼 불러오기
@@ -223,8 +224,10 @@ function listMsgDataView(){
 			
 			// 문자 재전송 New
 			if (msgResendAllFlag == "Y") {
-				// 문자 그룹정보 => 재전송용
-				getMjMsgGroupInfoByResend();
+				if (msgResendAllReplaceYn != "Y") {
+					// 문자 그룹정보 => 재전송용
+					getMjMsgGroupInfoByResend();
+				}
 
 				// 문자 상세정보 => 재전송용
 				getMjMsgListByResend();
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp
index e08a8c96..1516e032 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp
@@ -23,6 +23,7 @@ var popCustomScrT=0;	// 맞춤제작 요청 JSPark => 2023.02.21 추가
 var msgResendAllFlag = "${msgResendAllFlag}";
 var msgResendAllGroupId = "${msgResendAllGroupId}";
 var msgResendAllAdvertiseYn = "${msgResendAllAdvertiseYn}";
+var msgResendAllReplaceYn = "${msgResendAllReplaceYn}";
 
 $(document).ready(function(){
 	var tsMoreSampleYn = "${moreSampleYn}";
@@ -418,8 +419,10 @@ function listMsgDataView(){
 			
 			// 문자 재전송 New
 			if (msgResendAllFlag == "Y") {
-				// 문자 그룹정보 => 재전송용
-				getMjMsgGroupInfoByResend();
+				if (msgResendAllReplaceYn != "Y") {
+					// 문자 그룹정보 => 재전송용
+					getMjMsgGroupInfoByResend();
+				}
 
 				// 문자 상세정보 => 재전송용
 				getMjMsgListByResend();
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
index 7b2c1867..dc8ce99e 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
@@ -58,8 +58,26 @@ $(document).ready(function(){
 
 //문자 재전송
 function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) {
+	var form = document.reSendAllForm;
+	form.msgResendAllFlag.value = "Y";
+	form.msgResendAllGroupId.value = msgGroupId;
+
 	if (replaceCnt > 0) {
-		alert("치환문자는 재전송 불가합니다.");
+		if (confirm("특정문구 일괄변환 문자(치환문자)의 경우 문자내용은 재전송할 수 없고 받는 사람 목록만 불러올 수 있습니다.\n받는사람 목록을 불러올까요?")) {
+			// 광고문자
+			form.msgResendAllReplaceYn.value = "Y";
+			if (electionCnt > 0) {
+				form.action="/web/mjon/msgcampain/selectMsgDataView.do";
+			}
+			else {
+				if (advertisementCnt > 0) {
+					// 광고문자
+					form.msgResendAllAdvertiseYn.value = "Y";
+				}
+				form.action="/web/mjon/msgdata/selectMsgDataView.do";
+			}
+			form.submit();					
+		}
 	}
 	else {
 		var title = "";
@@ -70,11 +88,7 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt)
 			title = "문자발송";
 		}
 		
-	    //if (confirm(title + " 화면으로 이동합니다.\n문자내용, 받는사람 확인후 발송해주세요.")) {
-	    if (confirm("문자내용, 받는사람 확인후 발송해주세요.")) {
-			var form = document.reSendAllForm;
-			form.msgResendAllFlag.value = "Y";
-			form.msgResendAllGroupId.value = msgGroupId;
+	    if (confirm("문자 재전송 하시겠습니까?\n문자내용, 받는 사람 목록 확인후 발송해주세요.")) {
 			if (electionCnt > 0) {
 				form.action="/web/mjon/msgcampain/selectMsgDataView.do";
 			}
@@ -112,7 +126,9 @@ function fnRevDetailPop(msgGroupId, msgId, fileCnt){
 	<form name="reSendAllForm" method="post">
 		<input type="hidden" name="msgResendAllFlag" value="N"/>
 		<input type="hidden" name="msgResendAllGroupId" value=""/>
-		<input type="hidden" name="msgResendAllAdvertiseYn" value="N"/>		
+		<input type="hidden" name="msgResendAllAdvertiseYn" value="N"/>
+		<input type="hidden" name="msgResendAllReplaceYn" value="N"/>		
+		
 	</form>
 	
 				<!-- 전송내역 불러오기 -->					
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
index aac6f6f8..3c945a2c 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentView.jsp
@@ -705,8 +705,26 @@ function infoPop(pageUrl){
 
 //문자 재전송
 function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt) {
+	var form = document.reSendAllForm;
+	form.msgResendAllFlag.value = "Y";
+	form.msgResendAllGroupId.value = msgGroupId;
+
 	if (replaceCnt > 0) {
-		alert("치환문자는 재전송 불가합니다.");
+		if (confirm("특정문구 일괄변환 문자(치환문자)의 경우 문자내용은 재전송할 수 없고 받는 사람 목록만 불러올 수 있습니다.\n받는사람 목록을 불러올까요?")) {
+			// 광고문자
+			form.msgResendAllReplaceYn.value = "Y";
+			if (electionCnt > 0) {
+				form.action="/web/mjon/msgcampain/selectMsgDataView.do";
+			}
+			else {
+				if (advertisementCnt > 0) {
+					// 광고문자
+					form.msgResendAllAdvertiseYn.value = "Y";
+				}
+				form.action="/web/mjon/msgdata/selectMsgDataView.do";
+			}
+			form.submit();					
+		}
 	}
 	else {
 		var title = "";
@@ -717,10 +735,7 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt)
 			title = "문자발송";
 		}
 		
-	    if (confirm(title + " 화면으로 이동합니다.\n문자내용, 받는사람 확인후 발송해주세요.")) {
-			var form = document.reSendAllForm;
-			form.msgResendAllFlag.value = "Y";
-			form.msgResendAllGroupId.value = msgGroupId;
+	    if (confirm(title + " 화면으로 이동합니다.\n문자내용, 받는 사람 목록 확인후 발송해주세요.")) {
 			if (electionCnt > 0) {
 				form.action="/web/mjon/msgcampain/selectMsgDataView.do";
 			}
@@ -1082,4 +1097,5 @@ function fnMjMsgReSendAll(msgGroupId, replaceCnt, electionCnt, advertisementCnt)
 		<input type="hidden" name="msgResendAllFlag" value="N"/>
 		<input type="hidden" name="msgResendAllGroupId" value=""/>
 		<input type="hidden" name="msgResendAllAdvertiseYn" value="N"/>		
+		<input type="hidden" name="msgResendAllReplaceYn" value="N"/>
 	</form>	
\ No newline at end of file

From 5b43d4543a730bdbc7a3612338e675a325c29289 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Tue, 17 Oct 2023 12:37:11 +0900
Subject: [PATCH 08/26] =?UTF-8?q?=EB=AC=B8=EC=9E=90=EB=82=B4=EC=9A=A9=20?=
 =?UTF-8?q?=EA=B8=80=EC=9E=90=EC=88=98=20=EC=B2=B4=ED=81=AC=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp | 6 +++---
 src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp    | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp
index 0f020252..574f19a5 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp
@@ -75,7 +75,7 @@ function getMjMsgGroupInfoByResend() {
 				// 발신번호
 				var reCallFrom = $.trim(removeDash($("#callFromList option:selected").val()));
 				if ($.trim(removeDash(msgData.callFrom)) != reCallFrom) {
-					alert("선택된 발신번호가 이전에 발송한 발신번호가 아닙니다.\n발신번호를 확인해주세요.")
+					alert("발신번호가 이전에 발송한 번호가 아닙니다.\n발신번호를 확인해주세요.")
 				}
 				
 				var smsTxt = msgData.smsTxt;
@@ -134,10 +134,10 @@ function getMjMsgGroupInfoByResend() {
 						myMsgImageControl(imgSrc, "edit_n", "Template", imgId);
 					}
 					
-					fnByteString(smsTxt);
+					fnByteString($('#smsTxtArea').val());
 				}
 				else {
-					fnByteString(smsTxt);
+					fnByteString($('#smsTxtArea').val());
 				}
 				
 				// 문자전송 상단으로 이동
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp
index 1516e032..c9864d74 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp
@@ -101,7 +101,7 @@ function getMjMsgGroupInfoByResend() {
 				// 발신번호
 				var reCallFrom = $.trim(removeDash($("#callFromList option:selected").val()));
 				if ($.trim(removeDash(msgData.callFrom)) != reCallFrom) {
-					alert("선택된 발신번호가 이전에 발송한 발신번호가 아닙니다.\n발신번호를 확인해주세요.")
+					alert("발신번호가 이전에 발송한 번호가 아닙니다.\n발신번호를 확인해주세요.")
 				}
 				
 				var smsTxt = msgData.smsTxt;
@@ -165,10 +165,10 @@ function getMjMsgGroupInfoByResend() {
 						myMsgImageControl(imgSrc, "edit_n", "Template", imgId);
 					}
 					
-					fnByteString(smsTxt);
+					fnByteString($('#smsTxtArea').val());
 				}
 				else {
-					fnByteString(smsTxt);
+					fnByteString($('#smsTxtArea').val());
 				}
 				
 				// 문자전송 상단으로 이동

From 83e9396be243ed4515a43cceb4124afc9b463945 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Tue, 17 Oct 2023 14:39:38 +0900
Subject: [PATCH 09/26] =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=9E=AC=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1=EC=8B=9C=20location.reload=20=3D>=20location.href=20?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20=EC=9E=AC=EC=A0=84=EC=86=A1=20?=
 =?UTF-8?q?=EB=AC=B8=EC=9E=90=EA=B0=80=20=EB=B0=9C=EC=86=A1=ED=9B=84=20?=
 =?UTF-8?q?=EB=98=90=20=EB=82=98=EC=98=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/web/msgcampain/MsgDataView.jsp     | 14 +++++++++++---
 .../webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp | 13 ++++++++++---
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp
index 574f19a5..e01d718e 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataView.jsp
@@ -197,6 +197,11 @@ function getMjMsgListByResend() {
 	});
 }
 
+//문자발송 URL Move
+function goMsgUrlMove() {
+	document.location.href = "/web/mjon/msgcampain/selectMsgDataView.do";
+}
+
 function listMsgDataView(){
 	
 	var sendData = $(document.searchForm).serializeArray() ;
@@ -1459,7 +1464,8 @@ function fn_sendMsgData(){
 									}else if("statusFail" == returnData.result){
 										
 										alert(returnData.message);
-										location.reload();
+										//문자발송 URL Move
+										goMsgUrlMove();
 										return false;
 										
 									}else{
@@ -1708,7 +1714,8 @@ function sendMsgAjax(paramSmsCnt, paramBlockCnt){
 				}else if("statusFail" == returnData.result){
 					
 					alert(returnData.message);
-					location.reload();
+					//문자발송 URL Move
+					goMsgUrlMove();
 					return false;
 					
 				}else{
@@ -1880,7 +1887,8 @@ function fnMyMsgSearchListOrd(){
 
 function msgSuccessClose(obj){
 	$(obj).closest('.pop_msg_success').attr('style','');
-	location.reload(true);
+	//문자발송 URL Move
+	goMsgUrlMove();
 	$('html').scrollTop(0);
 }
 
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp
index c9864d74..f0d2ec9c 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataView.jsp
@@ -228,6 +228,10 @@ function getMjMsgListByResend() {
 	});
 }
 
+// 문자발송 URL Move 
+function goMsgUrlMove() {
+	document.location.href = "/web/mjon/msgdata/selectMsgDataView.do";
+}
 
 function listMsgDataView(){
 	
@@ -1668,7 +1672,8 @@ function fn_sendMsgData(){
 									}else if("statusFail" == returnData.result){
 										
 										alert(returnData.message);
-										location.reload();
+										//문자발송 URL Move
+										goMsgUrlMove();
 										return false;
 										
 									}else{
@@ -1917,7 +1922,8 @@ function sendMsgAjax(paramSmsCnt, paramBlockCnt){
 				}else if("statusFail" == returnData.result){
 					
 					alert(returnData.message);
-					location.reload();
+					//문자발송 URL Move
+					goMsgUrlMove();
 					return false;
 					
 				}else{
@@ -2077,7 +2083,8 @@ function fnMyMsgSearchListOrd(){
 
 function msgSuccessClose(obj){
 	$(obj).closest('.pop_msg_success').attr('style','');
-	location.reload(true);
+	//문자발송 URL Move
+	goMsgUrlMove();
 	$('html').scrollTop(0);
 }
 

From 361aae015aa6205ec1c062f33d63f63802ba1946 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Tue, 17 Oct 2023 17:20:24 +0900
Subject: [PATCH 10/26] =?UTF-8?q?=EC=9E=AC=EC=A0=84=EC=86=A1=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EB=85=B8=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp  | 3 ++-
 src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp     | 3 ++-
 src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
index 29ce9b75..5e4f78bf 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
@@ -4078,10 +4078,11 @@ function getMjMsgSentListAll(pageNo) {
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
 											</div>
-											<%--
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
 											</div>
+											<%--
+
 											--%>											
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
index 367d5f93..7dc20ebc 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -3878,10 +3878,11 @@ function getMjMsgSentListAll(pageNo) {
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
 											</div>
-											<%--
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
 											</div>
+											<%--
+
 											--%>
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
index f4189ea7..83179b52 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
@@ -207,8 +207,9 @@ $(document).ready(function(){
 							</td>
 							<td name="listTd">
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
+								<button class="btnType btnType20" onClick="javascript:fnMjMsgReSendAll('${resultAllSentList.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>
 								<%--
-								<button class="btnType btnType20" onClick="javascript:fnMjMsgReSendAll('${resultAllSentList.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>								
+								
 								--%>
 							</td>
 							<td name="listTd">

From 70c057f23e0a526621bfba8bbb282aa4d7fec55d Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Tue, 17 Oct 2023 17:31:06 +0900
Subject: [PATCH 11/26] =?UTF-8?q?=EC=9E=AC=EC=A0=84=EC=86=A1=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=EC=88=A8=EA=B8=B0=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp  | 3 +--
 src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp     | 3 +--
 src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp | 3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
index 5e4f78bf..29ce9b75 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
@@ -4078,11 +4078,10 @@ function getMjMsgSentListAll(pageNo) {
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
 											</div>
+											<%--
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
 											</div>
-											<%--
-
 											--%>											
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
index 7dc20ebc..367d5f93 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -3878,11 +3878,10 @@ function getMjMsgSentListAll(pageNo) {
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
 											</div>
+											<%--
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
 											</div>
-											<%--
-
 											--%>
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
index 83179b52..f4189ea7 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
@@ -207,9 +207,8 @@ $(document).ready(function(){
 							</td>
 							<td name="listTd">
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
-								<button class="btnType btnType20" onClick="javascript:fnMjMsgReSendAll('${resultAllSentList.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>
 								<%--
-								
+								<button class="btnType btnType20" onClick="javascript:fnMjMsgReSendAll('${resultAllSentList.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>								
 								--%>
 							</td>
 							<td name="listTd">

From 7d835948ba5f7af69be12a951374b5699ac0bf3c Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Wed, 18 Oct 2023 10:26:26 +0900
Subject: [PATCH 12/26] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EC=83=81=EC=84=B8=20=ED=8C=9D=EC=97=85=20?=
 =?UTF-8?q?=EC=B5=9C=EA=B7=BC=20=EC=95=8C=EB=A6=BC=ED=86=A1=20=EB=82=B4?=
 =?UTF-8?q?=EC=9A=A9=20=EB=A7=88=EC=9A=B0=EC=8A=A4=20=ED=98=B8=EB=B2=84?=
 =?UTF-8?q?=EC=8B=9C=20=EC=83=81=EC=84=B8=EB=82=B4=EC=9A=A9=20=ED=8C=9D?=
 =?UTF-8?q?=EC=97=85=20=ED=91=9C=EC=8B=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp    | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
index fd248b14..045d4756 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
@@ -40,6 +40,12 @@ tbody tr td.sms_detail p {overflow:hidden;text-overflow:ellipsis;white-space:now
 tbody tr td.sms_detail .sms_detail_hover {overflow:hidden;text-overflow:ellipsis;display:none;word-wrap:break-word;-webkit-line-clamp:20;-webkit-box-orient:vertical;position:absolute;left:155px;top:1px;width:calc(100% + 230px);padding:15px;line-height:20px;white-space:normal;border:1px solid #e5e5e5;background:#fff;border-radius:5px;box-sizing:border-box;box-shadow:0px 3px 10px 0px rgb(0 0 0 / 0.2);z-index:1;font-size:14px;text-align:left;}
 tbody tr td.sms_detail .sms_detail_hover:after {content:'';position:absolute;left:0;bottom:0;width:100%;height:10px;background:#fff;border-radius:0 0 5px 5px;}
 tbody tr td.sms_detail:hover .sms_detail_hover {display:-webkit-box;}
+
+
+tbody tr td.sms_detail .kakao_detail_hover {overflow:hidden;text-overflow:ellipsis;display:none;word-wrap:break-word;-webkit-line-clamp:20;-webkit-box-orient:vertical;position:absolute;left:60px;top:1px;width:calc(100% + 230px);padding:15px;line-height:20px;white-space:normal;border:1px solid #e5e5e5;background:#fff;border-radius:5px;box-sizing:border-box;box-shadow:0px 3px 10px 0px rgb(0 0 0 / 0.2);z-index:1;font-size:14px;text-align:left;}
+tbody tr td.sms_detail .kakao_detail_hover:after {content:'';position:absolute;left:0;bottom:0;width:100%;height:10px;background:#fff;border-radius:0 0 5px 5px;}
+tbody tr td.sms_detail:hover .kakao_detail_hover {display:-webkit-box;}
+
 </style>
 
 <script src="/publish/js/jquery-3.5.0.js"></script>
@@ -4566,9 +4572,13 @@ function kakaoATDelayCancel(msgGroupId){
 																<c:otherwise>
 																	<div class="ellipsis_line">
 																		<c:out value="${kakaoResultList.smsTxt}"/>
+																		<div class="kakao_detail_hover">
+																			<c:out value="${kakaoResultList.smsTxt}"/>
+																		</div>
 																	</div>
 																</c:otherwise>
-															</c:choose>											
+															</c:choose>			
+																							
 														</td>
 														<td><fmt:formatNumber value="${kakaoResultList.msgGroupCnt}" type="number" /></td>
 														<td><fmt:formatNumber value="${kakaoResultList.successCount}" type="number" /></td>
@@ -4704,6 +4714,9 @@ function kakaoATDelayCancel(msgGroupId){
 																<c:otherwise>
 																	<div class="ellipsis_line">
 																		<c:out value="${kakaoReserveList.smsTxt}"/>
+																		<div class="kakao_detail_hover">
+																			<c:out value="${kakaoReserveList.smsTxt}"/>
+																		</div>
 																	</div>
 																</c:otherwise>
 															</c:choose>

From 68000d668f8106b727e36486990cba4aae4719cd Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Wed, 18 Oct 2023 10:37:40 +0900
Subject: [PATCH 13/26] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=83=81=EC=84=B8>?=
 =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20=EC=A7=80=EC=97=B0=EB=82=B4?=
 =?UTF-8?q?=EC=97=AD=20=EB=AF=B8=EB=A6=AC=EB=B3=B4=EA=B8=B0=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
index 045d4756..5b884e4e 100644
--- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
+++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp
@@ -4846,6 +4846,9 @@ function kakaoATDelayCancel(msgGroupId){
 															<c:otherwise>
 																<div class="ellipsis_line">
 																	<c:out value="${kakaoDelayInfo.smsTxt}"/>
+																	<div class="kakao_detail_hover">
+																		<c:out value="${kakaoDelayInfo.smsTxt}"/>
+																	</div>																	
 																</div>
 															</c:otherwise>
 														</c:choose>

From 51e6b784c7f872686925683fed7b8892bac6cb4f Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Wed, 18 Oct 2023 10:43:42 +0900
Subject: [PATCH 14/26] =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B2=B0=EA=B3=BC>?=
 =?UTF-8?q?=EC=88=98=EC=8B=A0=EC=98=A4=EB=A5=98=20=3D>=20=EB=AC=B8?=
 =?UTF-8?q?=EC=9E=90=20=EC=9E=AC=EC=A0=84=EC=86=A1=20=EB=B2=84=ED=8A=BC=20?=
 =?UTF-8?q?=EC=A3=BC=EC=84=9D=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp
index e04657e8..9cce9597 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentFailListAjax.jsp
@@ -278,7 +278,9 @@ $(document).ready(function(){
 			<button type="button" data-tooltip="rev_popup02" class="btnType btnType15"><i class="add_img"></i>그룹등록</button>
 			<button type="button" class="btnType btnType15" onClick="javascript:fnDeleteAddrNo('${mjonMsgSentVO.listType}'); return false;"><i class="remove_img"></i>주소록에서 번호 삭제</button>
             <button type="button" class="btnType btnType15" onClick="javascript:fnAddBlockNo('${mjonMsgSentVO.listType}'); return false;"></i>수신거부번호 등록</button>
+			<%--
 			<button type="button" class="btnType btnType18 c_002c9a" onClick="javascript:fnReSendMsg(); return false;">문자 재전송</button>
+			--%>
 		</div>
 		<div class="table_btn_right">
 			<button type="button" class="excel_btn btnType" onClick="javascript:fnExcelDownLoad('fail','${mjonMsgSentVO.tabType}'); return false;"><i class="downroad"></i>엑셀 다운로드</button>

From 0041ef67bffee6c25d96bbddbe0d3befffebd088 Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Wed, 18 Oct 2023 18:16:09 +0900
Subject: [PATCH 15/26] =?UTF-8?q?=EB=A9=94=EC=9D=B8=ED=99=94=EB=A9=B4=20?=
 =?UTF-8?q?=EB=B0=B0=EB=84=88=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EA=B8=B0=EB=8A=A5=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/itn/web/MainController.java     |  7 +++
 .../webapp/WEB-INF/jsp/web/main/mainPage.jsp  | 63 ++++++++++++++-----
 2 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/src/main/java/itn/web/MainController.java b/src/main/java/itn/web/MainController.java
index cc45838a..80ae9fce 100644
--- a/src/main/java/itn/web/MainController.java
+++ b/src/main/java/itn/web/MainController.java
@@ -677,6 +677,13 @@ public class MainController {
 		List<LetterVO> mainMsgTagList = letterService.selectMainMsgTagWebList(letterMsgVO);
 		model.addAttribute("mainMsgTagList", mainMsgTagList);
 		
+		{//상단 메인배너 롤링 이미지 불러오기
+			
+			List<MainzoneVO> resultMainzoneList = egovPopupManageService.selectMainzoneListRolling();
+			model.addAttribute("mainzoneList", resultMainzoneList);
+			
+		}
+		
 		return "web/main/mainPage";
 	}
 	
diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
index 1a11febb..350fe261 100644
--- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp
@@ -1266,21 +1266,54 @@ function fn_click_banner_add_stat(bannerMenuCode){
 <div class="visual">
 	<div class="swiper-container visual_swiper">
 		<div class="swiper-wrapper" id="mainSwiperWrapperArea">
-			<div class="swiper-slide">
-				<div class="slideImg"><img src="/publish/images/main/f_visual_06_20230802.jpg" alt="문자온, 카카오 '알림톡' 서비스 오픈! 문자온 알림톡, 대한민국 최저가 선언! 조건없이 무조건 6.9원! 카카오톡 채널아이디 추가를 하지 않은 이용자에게도 카카오톡 메시지 발송이 가능한 서비스! 알림톡 바로가기 알림톡 도착 kakao 문자온에서 알림톡이 도착하였습니다! 기업전용/1,000자 이하 텍스트 & 이미지/문자 대비 65% 저렴" usemap="#allimtalk-map"></div>
-			</div>
-			<div class="swiper-slide">
-				<div class="slideImg"><img id="mainSlideImg_1001" src="/publish/images/main/f_visual_01_20231006.jpg" alt="문자는 이제, 문자온! 단 한번, 국내 최저가! 인생 최저가! 첫결제 단문 7.5원 장문 32원 그림 59원 Halloween 즐겁고 유쾌한 할로윈데이 보내세요 가을엔 독서 같이 책읽으실래요?" usemap="#image-map" /></div>
-			</div>			
-			<div class="swiper-slide">
-				<div class="slideImg"><img src="/publish/images/main/f_visual_02_20221116.jpg" alt="문자도 보내고! 현금도 챙기는! 문자온만의 특별한 혜택! 결제금액의 2% 포인트 추가 적립! 포인트 1만점 이상 적립 시 현금페이백" /></div>
-			</div>
-			<div class="swiper-slide">
-				<div class="slideImg"><img id="mainSlideImg_1002" src="/publish/images/main/f_visual_03_20231006.jpg" alt="다른 사이트에는 없다! 오직 문자온에만 있다! 최고의 디자이너가 직접 제작하는 그림문자 맞춤제작을 통해 나만의 문자를 디자인 해보세요. 가을은 캠핑의 계절! 낭만캠핑 캠핑하기 좋은 계절, 가을이 돌아왔습니다. 즐거운 캠핑을 떠나고 싶으신가요? 지금 이벤트에 참여하시면, 캠핑 지원금을 드립니다. 지금 바로 참여하세요! 즐거운 캠핑 지원금 문자온에서 확인해보세요! HALLOWEEN 할로윈이벤트 이벤트에 참여하시고 무시무시한 혜택을 받아보세요 이벤트 기간 2099.10.01  10.31 이벤트 대상 10,000원 이상 구매한 모든 고객 event 01 5만원 이상 구매시 5,000원할인쿠폰 증정! event02 이벤트 기간동안 무료배송! event03 어플 설치 시 10% 추가 할인 쿠폰 증정! HALLOWEEN 할로윈 코스튬 할로윈 분위기에 맞게 코스튬을 하고 와요! 할로윈 CAKE 할로윈을 맞이하여 호박케이크를 만들어봐요! 문자온 영어학원 T.031.123.4567" /></div>
-			</div>
-			<div class="swiper-slide">
-				<div class="slideImg"><img src="/publish/images/main/f_visual_04_20221116.jpg" alt="문자는 이제, 문자온! 선택은 역시 문자온! 문자사이트 선택의 5가지 기준 1. 가격, 속도, 성능, 기능, 보안이 보장되는가? 2. 결제, 정산, 계산서 발행 등 업무가 자동화 되어 있고 편리한가? 3. 최신 IT 기술과 트렌드가 반영되어 있는가? 4. 회원가입 및 발신번호 인증이 쉽고 빠르며, 대량문자를 전송하기에 사용이 편리한가? 5. 매일 문자샘플이 업데이트 되고, CS 및 기술응대가 실시간적으로 이루어지는가?" /></div>
-			</div>
+			<c:choose>
+				<c:when test="${not empty mainzoneList}">
+					<c:forEach var="mainzone" items="${mainzoneList}" varStatus="status">
+						<div class="swiper-slide">
+							<div class="slideImg">
+								<c:choose>
+									<c:when test="${fn:contains(mainzone.content,'알림톡')}">
+										<img src="/cmm/fms/getImage.do?atchFileId=<c:out value='${mainzone.mainzoneImageFile}'/>" alt="<c:out value='${mainzone.content}'/>" usemap="#allimtalk-map">
+									</c:when>
+									<c:otherwise>
+										<img src="/cmm/fms/getImage.do?atchFileId=<c:out value='${mainzone.mainzoneImageFile}'/>" alt="<c:out value='${mainzone.content}'/>">										
+									</c:otherwise>
+								</c:choose>
+							</div>
+						</div>
+					</c:forEach>
+				</c:when>
+				<c:otherwise>
+					<%-- 메인 배너 이미지 등록된 건이 없는 경우 기본적으로 나오는 이미지 3개 --%>
+					<div class="swiper-slide">
+						<div class="slideImg"><img src="/publish/images/main/f_visual_06_20230802.jpg" alt="문자온, 카카오 '알림톡' 서비스 오픈! 문자온 알림톡, 대한민국 최저가 선언! 조건없이 무조건 6.9원! 카카오톡 채널아이디 추가를 하지 않은 이용자에게도 카카오톡 메시지 발송이 가능한 서비스! 알림톡 바로가기 알림톡 도착 kakao 문자온에서 알림톡이 도착하였습니다! 기업전용/1,000자 이하 텍스트 & 이미지/문자 대비 65% 저렴" usemap="#allimtalk-map"></div>
+					</div>
+					<div class="swiper-slide">
+						<div class="slideImg"><img src="/publish/images/main/f_visual_02_20221116.jpg" alt="문자도 보내고! 현금도 챙기는! 문자온만의 특별한 혜택! 결제금액의 2% 포인트 추가 적립! 포인트 1만점 이상 적립 시 현금페이백" /></div>
+					</div>
+					<div class="swiper-slide">
+						<div class="slideImg"><img src="/publish/images/main/f_visual_04_20221116.jpg" alt="문자는 이제, 문자온! 선택은 역시 문자온! 문자사이트 선택의 5가지 기준 1. 가격, 속도, 성능, 기능, 보안이 보장되는가? 2. 결제, 정산, 계산서 발행 등 업무가 자동화 되어 있고 편리한가? 3. 최신 IT 기술과 트렌드가 반영되어 있는가? 4. 회원가입 및 발신번호 인증이 쉽고 빠르며, 대량문자를 전송하기에 사용이 편리한가? 5. 매일 문자샘플이 업데이트 되고, CS 및 기술응대가 실시간적으로 이루어지는가?" /></div>
+					</div>
+				</c:otherwise>
+			</c:choose>
+			<%-- 
+				<div class="swiper-slide">
+					<div class="slideImg"><img src="/publish/images/main/f_visual_06_20230802.jpg" alt="문자온, 카카오 '알림톡' 서비스 오픈! 문자온 알림톡, 대한민국 최저가 선언! 조건없이 무조건 6.9원! 카카오톡 채널아이디 추가를 하지 않은 이용자에게도 카카오톡 메시지 발송이 가능한 서비스! 알림톡 바로가기 알림톡 도착 kakao 문자온에서 알림톡이 도착하였습니다! 기업전용/1,000자 이하 텍스트 & 이미지/문자 대비 65% 저렴" usemap="#allimtalk-map"></div>
+				</div>
+				<div class="swiper-slide">
+					<div class="slideImg"><img id="mainSlideImg_1001" src="/publish/images/main/f_visual_01_20231006.jpg" alt="문자는 이제, 문자온! 단 한번, 국내 최저가! 인생 최저가! 첫결제 단문 7.5원 장문 32원 그림 59원 Halloween 즐겁고 유쾌한 할로윈데이 보내세요 가을엔 독서 같이 책읽으실래요?" usemap="#image-map" /></div>
+				</div>			
+				<div class="swiper-slide">
+					<div class="slideImg"><img src="/publish/images/main/f_visual_02_20221116.jpg" alt="문자도 보내고! 현금도 챙기는! 문자온만의 특별한 혜택! 결제금액의 2% 포인트 추가 적립! 포인트 1만점 이상 적립 시 현금페이백" /></div>
+				</div>
+				<div class="swiper-slide">
+					<div class="slideImg"><img id="mainSlideImg_1002" src="/publish/images/main/f_visual_03_20231006.jpg" alt="다른 사이트에는 없다! 오직 문자온에만 있다! 최고의 디자이너가 직접 제작하는 그림문자 맞춤제작을 통해 나만의 문자를 디자인 해보세요. 가을은 캠핑의 계절! 낭만캠핑 캠핑하기 좋은 계절, 가을이 돌아왔습니다. 즐거운 캠핑을 떠나고 싶으신가요? 지금 이벤트에 참여하시면, 캠핑 지원금을 드립니다. 지금 바로 참여하세요! 즐거운 캠핑 지원금 문자온에서 확인해보세요! HALLOWEEN 할로윈이벤트 이벤트에 참여하시고 무시무시한 혜택을 받아보세요 이벤트 기간 2099.10.01  10.31 이벤트 대상 10,000원 이상 구매한 모든 고객 event 01 5만원 이상 구매시 5,000원할인쿠폰 증정! event02 이벤트 기간동안 무료배송! event03 어플 설치 시 10% 추가 할인 쿠폰 증정! HALLOWEEN 할로윈 코스튬 할로윈 분위기에 맞게 코스튬을 하고 와요! 할로윈 CAKE 할로윈을 맞이하여 호박케이크를 만들어봐요! 문자온 영어학원 T.031.123.4567" /></div>
+				</div>
+				<div class="swiper-slide">
+					<div class="slideImg"><img src="/publish/images/main/f_visual_04_20221116.jpg" alt="문자는 이제, 문자온! 선택은 역시 문자온! 문자사이트 선택의 5가지 기준 1. 가격, 속도, 성능, 기능, 보안이 보장되는가? 2. 결제, 정산, 계산서 발행 등 업무가 자동화 되어 있고 편리한가? 3. 최신 IT 기술과 트렌드가 반영되어 있는가? 4. 회원가입 및 발신번호 인증이 쉽고 빠르며, 대량문자를 전송하기에 사용이 편리한가? 5. 매일 문자샘플이 업데이트 되고, CS 및 기술응대가 실시간적으로 이루어지는가?" /></div>
+				</div>
+			 --%>
+			 
 			<map name="allimtalk-map">
 				<area href="/web/mjon/alimtalk/kakaoAlimtalkMsgDataView.do" coords="299,286,514,338" shape="rect">
 			</map>

From c3622652c539e72f9d8bfdc7494bdc18c9b5e58b Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Thu, 19 Oct 2023 11:12:09 +0900
Subject: [PATCH 16/26] =?UTF-8?q?=EB=8B=A8=EB=AC=B8=20=EB=AC=B8=EC=9E=90?=
 =?UTF-8?q?=20=EB=B0=9C=EC=86=A1=EC=8B=9C=20=EC=9E=85=EB=A0=A5=20=EB=AC=B8?=
 =?UTF-8?q?=EC=9E=90=20=EB=82=B4=EC=9A=A9=EC=9D=B4=20=EC=97=86=EB=8A=94=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20=20-=20=EC=BB=A8?=
 =?UTF-8?q?=ED=8A=B8=EB=A1=A4=EB=9F=AC=EC=97=90=EC=84=9C=20=EC=B5=9C?=
 =?UTF-8?q?=EC=A2=85=20=EB=B0=9C=EC=86=A1=20=EC=84=9C=EB=B9=84=EC=8A=A4?=
 =?UTF-8?q?=EB=A1=9C=20=EC=A0=84=EB=8B=AC=ED=95=98=EA=B8=B0=20=EC=A0=84?=
 =?UTF-8?q?=EC=97=90=20=EB=8B=A8=EB=AC=B8/=EC=9E=A5=EB=AC=B8=EC=9D=98=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=EB=AC=B8=EC=9E=90=20=EB=82=B4=EC=9A=A9?=
 =?UTF-8?q?=EC=9D=B4=20=EC=9E=88=EB=8A=94=EC=A7=80=20=EB=8B=A4=EC=8B=9C?=
 =?UTF-8?q?=ED=95=9C=EB=B2=88=20=EC=B2=B4=ED=81=AC=20=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EB=A1=9C=EC=A7=81=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mjo/msgdata/web/MjonMsgDataController.java   | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
index f934df87..ddceaa2a 100644
--- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
+++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
@@ -3759,6 +3759,22 @@ public class MjonMsgDataController {
 					}else {// 그외 단문
 						mjonMsgVO.setMsgType("4"); 
 					}
+					
+					if(bytes < 1) {//단문, 장문의 경우 문자 내용이 없는 경우 발송 안되도록 처리
+						
+						System.out.println("===================================fncSendMsg======================================");
+			    		System.out.println("+++++++++++++++++++++++++++++++++++++++++++ 입력 문자 내용이 없습니다. ::: ");
+			    		System.out.println("===================================fncSendMsg======================================");
+						
+						modelAndView.addObject("message", "입력 문자 내용을 확인할 수 없습니다. 문자 내용을 입력해 주세요.");
+						modelAndView.addObject("result", "fail");
+						modelAndView.addObject("resultSts", "0");
+						modelAndView.addObject("resultBlockSts", "0");
+						
+						return modelAndView; 
+						
+					}
+
 				}else { //최대 문자길이 초과시
 					
 					modelAndView.addObject("message", "문자 치환 후 전송 문자 길이를 초과하였습니다.");

From c3f5191ac8f68f3fd360e324ad8c5f5b16148ddc Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Thu, 19 Oct 2023 14:20:16 +0900
Subject: [PATCH 17/26] =?UTF-8?q?=EC=B2=AB=EB=B2=88=EC=A7=B8=20=EC=BB=A4?=
 =?UTF-8?q?=EB=B0=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/js/pdfjs-3.11.174/web/cmaps/CNS2-V.bcmap    | 4 ++--
 .../webapp/js/pdfjs-3.11.174/web/cmaps/ETenms-B5-H.bcmap    | 4 ++--
 src/main/webapp/js/pdfjs-3.11.174/web/cmaps/GB-H.bcmap      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/webapp/js/pdfjs-3.11.174/web/cmaps/CNS2-V.bcmap b/src/main/webapp/js/pdfjs-3.11.174/web/cmaps/CNS2-V.bcmap
index 7588cec8..9cfbf508 100644
--- a/src/main/webapp/js/pdfjs-3.11.174/web/cmaps/CNS2-V.bcmap
+++ b/src/main/webapp/js/pdfjs-3.11.174/web/cmaps/CNS2-V.bcmap
@@ -1,3 +1,3 @@
-�RCopyright 1990-2009 Adobe Systems Incorporated.
-All rights reserved.
+�RCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
 See ./LICENSE�CNS2-H
\ No newline at end of file
diff --git a/src/main/webapp/js/pdfjs-3.11.174/web/cmaps/ETenms-B5-H.bcmap b/src/main/webapp/js/pdfjs-3.11.174/web/cmaps/ETenms-B5-H.bcmap
index a7d69db5..c76f5f98 100644
--- a/src/main/webapp/js/pdfjs-3.11.174/web/cmaps/ETenms-B5-H.bcmap
+++ b/src/main/webapp/js/pdfjs-3.11.174/web/cmaps/ETenms-B5-H.bcmap
@@ -1,3 +1,3 @@
-�RCopyright 1990-2009 Adobe Systems Incorporated.
-All rights reserved.
+�RCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
 See ./LICENSE�	ETen-B5-H`
 ^

\ No newline at end of file
diff --git a/src/main/webapp/js/pdfjs-3.11.174/web/cmaps/GB-H.bcmap b/src/main/webapp/js/pdfjs-3.11.174/web/cmaps/GB-H.bcmap
index 39189c54..fb51ca48 100644
--- a/src/main/webapp/js/pdfjs-3.11.174/web/cmaps/GB-H.bcmap
+++ b/src/main/webapp/js/pdfjs-3.11.174/web/cmaps/GB-H.bcmap
@@ -1,4 +1,4 @@
-�RCopyright 1990-2009 Adobe Systems Incorporated.
-All rights reserved.
-See ./LICENSE

!!��]aX!!]`�21�>	�p�z�$]��"R�d�-U�7�*�
4�%�+ �Z �{�/�%�<�9K�b�1]�.�"��`]�,�"]�
+�RCopyright 1990-2009 Adobe Systems Incorporated.
+All rights reserved.
+See ./LICENSE

!!��]aX!!]`�21�>	�p�z�$]��"R�d�-U�7�*�
4�%�+ �Z �{�/�%�<�9K�b�1]�.�"��`]�,�"]�
 �"]�h�"]�F�"]�$�"]��"]�`�"]�>�"]��"]�z�"]�X�"]�6�"]��"]�r�"]�P�"]�.�"]��"]�j�"]�H�"]�&�"]��"]�b�"]�@�"]��"]�|�"]�Z�"]�8�"]��"]�t�"]�R�"]�0�"]��"]�l�"]�J�"]�(�"]��"]�d�"]�B�"]� �"X�~�']�W�"]�5�"]��"]�q�"]�O�"]�-�"]��"]�i�"]�G�"]�%�"]��"]�a�"]�?�"]��"]�{�"]�Y�"]�7�"]��"]�s�"]�Q�"]�/�"]�
�"]�k�"]�I�"]�'�"]��"]�c�"]�A�"]��"]�}�"]�[�"]�9
\ No newline at end of file

From 5cae7603400fca60dcf987d048d090811951b3dd Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 19 Oct 2023 14:42:48 +0900
Subject: [PATCH 18/26] =?UTF-8?q?=EC=BB=A4=EB=B0=8B=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/test.jsp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/main/webapp/test.jsp b/src/main/webapp/test.jsp
index 578a7574..3e53cd21 100644
--- a/src/main/webapp/test.jsp
+++ b/src/main/webapp/test.jsp
@@ -35,6 +35,7 @@
 
 
 
+
 <!-- 네이버 공통 스크립트 , 모든 페이지에 노출되도록 설치. 단 전환페이지 설정값보다 항상 하단에 위치해야함 --> 
 <script type="text/javascript" src="//wcs.naver.net/wcslog.js"> </script> 
 <script type="text/javascript"> 

From 3dc400f3a21f8642209fbd58ad09c184fef1eb65 Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Thu, 19 Oct 2023 14:55:30 +0900
Subject: [PATCH 19/26] =?UTF-8?q?=EB=A9=94=EC=9D=B8=EB=B0=B0=EB=84=88=20?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
index 9af4f3dc..28856e43 100644
--- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
@@ -1147,9 +1147,6 @@ function actionLogin() {
     	<c:when test="${fn:contains(pageContext.request.requestURL , 'web/main/mainPage.do')}">
     		<div class="quickMenu main">
     	</c:when>
-    	<c:when test="${fn:contains(pageContext.request.requestURL , 'web/main/mainPageTest.do')}">
-    		<div class="quickMenu main">
-    	</c:when>
     	<c:otherwise>
     		<div class="quickMenu quickSub">
     	</c:otherwise>

From 5127d45ff86eb86311ab0c5b2128cfaf102a6261 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 19 Oct 2023 16:34:43 +0900
Subject: [PATCH 20/26] =?UTF-8?q?=EC=9E=AC=EC=A0=84=EC=86=A1=20=EB=B2=84?=
 =?UTF-8?q?=ED=8A=BC=20=ED=99=9C=EC=84=B1=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp  | 2 --
 src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp     | 2 --
 src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp | 2 --
 3 files changed, 6 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
index 29ce9b75..14462670 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
@@ -4078,11 +4078,9 @@ function getMjMsgSentListAll(pageNo) {
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
 											</div>
-											<%--
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
 											</div>
-											--%>											
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
 												<div class="error_hover_cont send_hover_cont">
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
index 367d5f93..c17ad928 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -3878,11 +3878,9 @@ function getMjMsgSentListAll(pageNo) {
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
 											</div>
-											<%--
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
 											</div>
-											--%>
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
 												<div class="error_hover_cont send_hover_cont">
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
index f4189ea7..48ff80b1 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
@@ -207,9 +207,7 @@ $(document).ready(function(){
 							</td>
 							<td name="listTd">
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
-								<%--
 								<button class="btnType btnType20" onClick="javascript:fnMjMsgReSendAll('${resultAllSentList.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>								
-								--%>
 							</td>
 							<td name="listTd">
 								<c:choose>

From 479353e3a3f878887c5babda1f0a31edd48c1b83 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 19 Oct 2023 18:50:13 +0900
Subject: [PATCH 21/26] =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=9E=AC=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1=20=EC=BF=BC=EB=A6=AC=20=EC=84=B1=EB=8A=A5=EA=B0=9C?=
 =?UTF-8?q?=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
index 344c5a3b..4e96203a 100644
--- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
@@ -267,6 +267,7 @@
 			, orderByCode					 AS orderByCode
 			, RESULT						 AS msgResult
 			, sendKind						 AS sendKind
+			, MSG_KIND						 AS msgKind
 		FROM
 			( SELECT
 				B.USER_ID
@@ -291,6 +292,7 @@
 				, A.RSLT_CODE
 				, A.RSLT_CODE2
 				, B.SEND_KIND as sendKind
+				, B.MSG_KIND
 				, CASE
 					WHEN B.MSG_TYPE = '6'
 						AND B.FILE_CNT > 0
@@ -413,10 +415,10 @@
 			</isNotEmpty>
 			<isNotEmpty property="msgSentType">
 				<isEqual property="msgSentType" compareValue="01" >
-					AND SUBSTR(SMS_TXT, 1, 8) != '(선거운동정보)'
+					AND MSG_KIND != 'C'
 				</isEqual>
 				<isEqual property="msgSentType" compareValue="02" >
-					AND SUBSTR(SMS_TXT, 1, 8) = '(선거운동정보)'
+					AND MSG_KIND = 'C'
 				</isEqual>
 			</isNotEmpty>
 		GROUP BY MSG_GROUP_ID

From ef57cc3c56f273fda01efe8e23e7d1835ad113b7 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 19 Oct 2023 18:56:08 +0900
Subject: [PATCH 22/26] =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=9E=AC=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1=20=EB=B2=84=ED=8A=BC=20=EC=A3=BC=EC=84=9D=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp | 2 ++
 src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp    | 2 ++
 .../webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp     | 4 +++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
index 14462670..4b192c5a 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
@@ -4078,9 +4078,11 @@ function getMjMsgSentListAll(pageNo) {
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
 											</div>
+											<%-- 
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
 											</div>
+											--%>
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
 												<div class="error_hover_cont send_hover_cont">
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
index c17ad928..367d5f93 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -3878,9 +3878,11 @@ function getMjMsgSentListAll(pageNo) {
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
 											</div>
+											<%--
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
 											</div>
+											--%>
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
 												<div class="error_hover_cont send_hover_cont">
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
index 48ff80b1..0ca3df70 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
@@ -207,7 +207,9 @@ $(document).ready(function(){
 							</td>
 							<td name="listTd">
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
-								<button class="btnType btnType20" onClick="javascript:fnMjMsgReSendAll('${resultAllSentList.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>								
+								<%-- 
+								<button class="btnType btnType20" onClick="javascript:fnMjMsgReSendAll('${resultAllSentList.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>
+								--%>								
 							</td>
 							<td name="listTd">
 								<c:choose>

From 53747d5c7e19102b3b67e93b4c0a4fd6e49f5725 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Thu, 19 Oct 2023 19:06:49 +0900
Subject: [PATCH 23/26] =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=9E=AC=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1=20=EC=BF=BC=EB=A6=AC=20=EC=84=B1=EB=8A=A5=EA=B0=9C?=
 =?UTF-8?q?=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml              | 8 ++++++++
 .../webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp  | 2 --
 .../webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp     | 2 --
 .../webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp | 2 --
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
index 4e96203a..fdb7027c 100644
--- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
@@ -319,6 +319,14 @@
 				<![CDATA[ 
 					AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
 				]]>
+				<isNotEmpty property="msgSentType">
+					<isEqual property="msgSentType" compareValue="01" >
+						AND B.MSG_KIND != 'C'
+					</isEqual>
+					<isEqual property="msgSentType" compareValue="02" >
+						AND B.MSG_KIND = 'C'
+					</isEqual>
+				</isNotEmpty>				
 			)M
 			LEFT JOIN
 			(
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
index 4b192c5a..14462670 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
@@ -4078,11 +4078,9 @@ function getMjMsgSentListAll(pageNo) {
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
 											</div>
-											<%-- 
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
 											</div>
-											--%>
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
 												<div class="error_hover_cont send_hover_cont">
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
index 367d5f93..c17ad928 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp
@@ -3878,11 +3878,9 @@ function getMjMsgSentListAll(pageNo) {
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
 											</div>
-											<%--
 											<div class="btn_popup_wrap">
 												<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
 											</div>
-											--%>
 											<div class="btn_popup_wrap check_validity_wrap">
 												<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
 												<div class="error_hover_cont send_hover_cont">
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
index 0ca3df70..02541146 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp
@@ -207,9 +207,7 @@ $(document).ready(function(){
 							</td>
 							<td name="listTd">
 								<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
-								<%-- 
 								<button class="btnType btnType20" onClick="javascript:fnMjMsgReSendAll('${resultAllSentList.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>
-								--%>								
 							</td>
 							<td name="listTd">
 								<c:choose>

From 45807ed23afd6021b700a2847865686f89d12565 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Fri, 20 Oct 2023 10:49:36 +0900
Subject: [PATCH 24/26] =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=9E=AC=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1=20=EB=AA=A9=EB=A1=9D=20=EC=84=B1=EB=8A=A5=EA=B0=9C?=
 =?UTF-8?q?=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../msgdata/web/MjonMsgDataController.java    |   2 +-
 .../msgsent/service/MjonMsgSentService.java   |   3 +
 .../msgsent/service/impl/MjonMsgSentDAO.java  |   8 +
 .../service/impl/MjonMsgSentServiceImpl.java  |   9 +
 .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml  | 193 ++++++++++++++++--
 .../jsp/web/msgdata/MsgSentListAjax.jsp       |   2 +-
 6 files changed, 203 insertions(+), 14 deletions(-)

diff --git a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
index 3f8fe15e..e945d8fb 100644
--- a/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
+++ b/src/main/java/itn/let/mjo/msgdata/web/MjonMsgDataController.java
@@ -6034,7 +6034,7 @@ public class MjonMsgDataController {
 			mjonMsgSentVO.setRecordCountPerPage(paginationInfo.getRecordCountPerPage());
 			
 	    	//전체 발송 리스트 불러오기
-	    	mjMsgSentList = mjonMsgSentService.selectAllMsgSentList(mjonMsgSentVO);
+	    	mjMsgSentList = mjonMsgSentService.selectAllMsgSentSimpleList(mjonMsgSentVO);
 	    	
 	    	paginationInfo.setTotalRecordCount( mjMsgSentList.size()> 0 ? (Integer.parseInt((mjMsgSentList.get(0)).getTotMsgCnt())) : 0);
     	}
diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java
index da96abda..c0d73343 100644
--- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java
+++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentService.java
@@ -16,6 +16,9 @@ public interface MjonMsgSentService {
 	//발송 관리 전체 발송 리스트 불러오기
 	public List<MjonMsgSentVO> selectAllMsgSentList(MjonMsgSentVO mjonMsgSentVO) throws Exception;
 	
+	//발송 관리 전체 발송 리스트 불러오기 => 주소록 조인 제거버전
+	public List<MjonMsgSentVO> selectAllMsgSentSimpleList(MjonMsgSentVO mjonMsgSentVO) throws Exception;
+	
 	//발송 관리 발송 성공,실패 건수 리스트 불러오기
 	public List<MjonMsgSentVO> selectAllMsgSentSucFailList(List<MjonMsgSentVO> resultAllResList, MjonMsgSentVO mjonMsgSentVO) throws Exception;
 	
diff --git a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java
index c6136e83..bb43a7f0 100644
--- a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java
+++ b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentDAO.java
@@ -49,12 +49,20 @@ public class MjonMsgSentDAO   extends EgovAbstractDAO {
 		return result;
 	}
 	
+	//발송 관리 전체 발송 리스트 불러오기
 	@SuppressWarnings("unchecked")
 	public List<MjonMsgSentVO> selectAllMsgSentList(MjonMsgSentVO mjonMsgSentVO) throws Exception{
 		
 		return (List<MjonMsgSentVO>) list("MjonMsgSentDAO.selectAllMsgSentList",mjonMsgSentVO);
 	}
 	
+	//발송 관리 전체 발송 리스트 불러오기 => 주소록 조인 제거버전
+	@SuppressWarnings("unchecked")
+	public List<MjonMsgSentVO> selectAllMsgSentSimpleList(MjonMsgSentVO mjonMsgSentVO) throws Exception{
+		
+		return (List<MjonMsgSentVO>) list("MjonMsgSentDAO.selectAllMsgSentSimpleList",mjonMsgSentVO);
+	}
+	
 	@SuppressWarnings("unchecked")
 	public List<MjonMsgSentVO> selectAllPrivateMsgSentList(MjonMsgSentVO mjonMsgSentVO) throws Exception{
 		
diff --git a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java
index 46f61440..f142d639 100644
--- a/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java
+++ b/src/main/java/itn/let/mjo/msgsent/service/impl/MjonMsgSentServiceImpl.java
@@ -84,6 +84,15 @@ public class MjonMsgSentServiceImpl  extends EgovAbstractServiceImpl implements
 		return resultList;
 	}
 	
+	//발송 관리 전체 발송 리스트 불러오기 => 주소록 조인 제거버전
+	public List<MjonMsgSentVO> selectAllMsgSentSimpleList(MjonMsgSentVO mjonMsgSentVO) throws Exception{
+		List<MjonMsgSentVO> resultList = new ArrayList<MjonMsgSentVO>();
+		
+		resultList = mjonMsgSentDAO.selectAllMsgSentSimpleList(mjonMsgSentVO);
+
+		return resultList;
+	}
+	
 	//발송 관리 발송 성공,실패 건수 리스트 불러오기
 	public List<MjonMsgSentVO> selectAllMsgSentSucFailList(List<MjonMsgSentVO> resultAllResList, MjonMsgSentVO mjonMsgSentVO) throws Exception{
 		
diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
index fdb7027c..dbaa135d 100644
--- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
@@ -319,14 +319,6 @@
 				<![CDATA[ 
 					AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
 				]]>
-				<isNotEmpty property="msgSentType">
-					<isEqual property="msgSentType" compareValue="01" >
-						AND B.MSG_KIND != 'C'
-					</isEqual>
-					<isEqual property="msgSentType" compareValue="02" >
-						AND B.MSG_KIND = 'C'
-					</isEqual>
-				</isNotEmpty>				
 			)M
 			LEFT JOIN
 			(
@@ -340,6 +332,185 @@
 				GROUP BY ADDR_PHONE_NO
 			)MA
 			ON M.CALL_TO = MA.ADDR_PHONE_NO
+		WHERE 1=1 
+			<isNotEmpty property="stateType">
+				<isEqual property="stateType" compareValue="all">
+					AND CUR_STATE IN ('0','1','2','3')
+				</isEqual>
+				<isEqual property="stateType" compareValue="ready">
+					AND CUR_STATE = '0'
+					AND RESERVE_C_YN = 'N'
+				</isEqual>
+				<isEqual property="stateType" compareValue="complete">
+					AND CUR_STATE IN ('2','3')
+					AND (RSLT_CODE IN ('0','100','101','110','4100','6600','1000','1001')  OR 	 RSLT_CODE2 IN ('0') )
+					AND	 RESERVE_C_YN = 'N'
+				</isEqual>
+				<isEqual property="stateType" compareValue="fail">
+					AND RESERVE_C_YN = 'N'
+					AND (RSLT_CODE NOT IN ('0','100','101','110','4100','6600','1000','1001')  OR 	 RSLT_CODE2 NOT IN ('0') )
+				</isEqual>
+			</isNotEmpty>
+			<isNotEmpty property="searchMsgType">
+				<isEqual property="searchMsgType" compareValue="S">
+					AND MSG_TYPE = '4'
+				</isEqual>
+				<isEqual property="searchMsgType" compareValue="L">
+					AND MSG_TYPE = '6'
+					AND FILE_CNT = '0'
+				</isEqual>
+				<isEqual property="searchMsgType" compareValue="M">
+				<![CDATA[  
+					AND MSG_TYPE = '6'
+					AND FILE_CNT > '0'
+				]]>
+				</isEqual>
+			</isNotEmpty>
+			<isEmpty property="searchMsgType">
+				<isEmpty property="tabType">
+					AND MSG_TYPE IN ('4','6')
+				</isEmpty>
+			</isEmpty>
+			<isNotEmpty property="tabType">
+				<isEqual property="tabType" compareValue="all">
+					AND MSG_TYPE IN ('4','6')
+				</isEqual>
+				<isEqual property="tabType" compareValue="S">
+					AND MSG_TYPE = '4'
+				</isEqual>
+				<isEqual property="tabType" compareValue="L">
+					AND MSG_TYPE = '6'
+					AND FILE_CNT = '0'
+				</isEqual>
+				<isEqual property="tabType" compareValue="M">
+				<![CDATA[  
+					AND MSG_TYPE = '6'
+					AND FILE_CNT > '0'
+				]]>
+				</isEqual>
+			</isNotEmpty>
+			<isNotEmpty property="searchKeyword">
+				<isEqual property="searchCondition" compareValue="1" >
+					AND SUBJECT LIKE CONCAT('%', #searchKeyword#, '%')
+				</isEqual>
+				<isEqual property="searchCondition" compareValue="2" >
+					AND CALL_FROM LIKE CONCAT('%', #searchKeyword#, '%')
+				</isEqual>
+				<isEqual property="searchCondition" compareValue="3" >
+					AND CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
+				</isEqual>
+			</isNotEmpty>
+			<isNotEmpty property="searchCondition_01">
+				AND sendKind = #searchCondition_01#
+			</isNotEmpty>
+			<isNotEmpty property="startDate">
+				<![CDATA[ 
+					AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
+				]]>
+			</isNotEmpty>
+			<isNotEmpty property="endDate">
+				<![CDATA[ 
+					AND 	DATE_FORMAT(REGDATE, '%Y-%m-%d')  <=  DATE_FORMAT(#endDate#, '%Y-%m-%d')  
+				]]>
+			</isNotEmpty>
+		GROUP BY MSG_GROUP_ID
+		ORDER BY 1=1
+		<isNotEmpty property="searchSortCnd">
+			<isEqual property="searchSortCnd" compareValue="curState">
+				, curState  $searchSortOrd$
+				, orderByrsltCode
+			</isEqual>
+			<isNotEqual  property="searchSortCnd" compareValue="curState">
+				,$searchSortCnd$
+			</isNotEqual>
+		</isNotEmpty>
+		<isNotEmpty property="searchSortOrd">
+			$searchSortOrd$
+		</isNotEmpty>
+		LIMIT  #recordCountPerPage# OFFSET #firstIndex#	
+	</select>
+	
+	<!-- 전체 발송결과 조회  (전송사별) => 주소록 조인 제거버전-->
+	<select id="MjonMsgSentDAO.selectAllMsgSentSimpleList" parameterClass="mjonMsgSentVO" resultClass="mjonMsgSentVO">
+		SELECT
+			COUNT(USER_ID) OVER()					 AS totMsgCnt
+			, USER_ID								 AS userId
+			, MSG_GROUP_ID							 AS msgGroupId
+			, MSG_GROUP_CNT							 AS msgGroupCnt
+			, SMS_TXT								 AS smsTxt
+			, SUBJECT								 AS subject
+			, DATE_FORMAT(REGDATE, '%Y-%m-%d %T')	 AS regdate
+			, DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T')	 AS reqdate
+			, CALL_FROM								 AS callFrom
+			, CALL_TO								 AS callTo
+			, FN_GETHYPHEN(CALL_FROM)	AS callFromComma
+			, FN_GETHYPHEN(CALL_TO)		AS callToComma
+			, ''						 AS addrNm
+			, TOT_PRICE								 AS totPrice
+			, EACH_PRICE							 AS eachPrice
+			, CUR_STATE								 AS curState
+			, RSLT_CODE								 AS rsltCode
+			, RSLT_CODE2							 AS rsltCode2
+			, DEL_FLAG						 AS delFlag
+			, MSG_TYPE						 AS msgType
+			, FILE_CNT						 AS fileCnt
+			, AGENT_CODE					 AS agentCode
+			, RESERVE_C_YN					 AS reserveCYn
+			, CANCELDATE					 AS cancelDate
+			, ''							 AS msgId
+			, orderByCode					 AS orderByCode
+			, sendKind						 AS sendKind
+			, MSG_KIND						 AS msgKind
+		FROM
+			( SELECT
+				B.USER_ID
+				, B.MSG_GROUP_ID
+				, B.MSG_GROUP_CNT
+				, B.SMS_TXT
+				, B.SUBJECT
+				, B.REGDATE
+				, B.REQ_DATE
+				, B.CALL_FROM
+				, B.TOT_PRICE
+				, B.EACH_PRICE
+				, B.DEL_FLAG
+				, B.MSG_TYPE
+				, B.FILE_CNT
+				, B.AGENT_CODE
+				, B.RESERVE_C_YN
+				, B.CANCELDATE
+				, A.MSG_SEQ
+				, A.CALL_TO
+				, A.CUR_STATE
+				, A.RSLT_CODE
+				, A.RSLT_CODE2
+				, B.SEND_KIND as sendKind
+				, B.MSG_KIND
+				, CASE
+					WHEN B.MSG_TYPE = '6'
+						AND B.FILE_CNT > 0
+					THEN '3'
+					WHEN B.MSG_TYPE = '6'
+						AND B.FILE_CNT = 0
+					THEN '2'
+					ELSE '1'
+					END orderByCode
+				<include refid="MjonMsgSentDAO.selectJoinQuery"/>
+				AND B.USER_ID = #userId#
+				AND B.DEL_FLAG ='N'
+				AND B.RESERVE_C_YN = 'N'
+				<![CDATA[ 
+					AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
+				]]>
+				<isNotEmpty property="msgSentType">
+					<isEqual property="msgSentType" compareValue="01" >
+						AND B.MSG_KIND != 'C'
+					</isEqual>
+					<isEqual property="msgSentType" compareValue="02" >
+						AND B.MSG_KIND = 'C'
+					</isEqual>
+				</isNotEmpty>				
+			)M
 		WHERE 1=1 
 			<isNotEmpty property="stateType">
 				<isEqual property="stateType" compareValue="all">
@@ -444,8 +615,8 @@
 			$searchSortOrd$
 		</isNotEmpty>
 		LIMIT  #recordCountPerPage# OFFSET #firstIndex#	
-	</select>
-	
+	</select>	
+		
 	<!-- 전체 발송결과 조회  (개인별)-->
 	<select id="MjonMsgSentDAO.selectAllPrivateMsgSentList" parameterClass="mjonMsgSentVO" resultClass="mjonMsgSentVO">
 		
@@ -637,8 +808,6 @@
 		LIMIT  #recordCountPerPage# OFFSET #firstIndex#	
 	</select>
 	
-	
-	
 	<!-- 건수별 상세 리스트 조회-->
 	<select id="MjonMsgSentDAO.selectAllMsgSentDetailList" parameterClass="mjonMsgSentVO" resultClass="mjonMsgSentVO">
 		
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
index dc8ce99e..9fc7f97e 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
@@ -141,7 +141,7 @@ function fnRevDetailPop(msgGroupId, msgId, fileCnt){
 							<col style="width: 11%;">
 							<col style="width: *%;">
 							<col style="width: 15%;">
-							<col style="width: 9%;">
+							<col style="width: 8%;">
 							<col style="width: 12%;">
 						</colgroup>
 						<thead>

From 05e63e18c5f3801afc7dd9d451792a3477396b86 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Fri, 20 Oct 2023 12:18:15 +0900
Subject: [PATCH 25/26] =?UTF-8?q?=EB=AC=B8=EC=9E=90=20=EC=9E=AC=EC=A0=84?=
 =?UTF-8?q?=EC=86=A1=20=EC=BF=BC=EB=A6=AC=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mjo/msgsent/service/MjonMsgSentVO.java    |   7 +
 .../sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml  | 317 ++++++++----------
 .../jsp/web/msgdata/MsgSentListAjax.jsp       |  22 +-
 3 files changed, 150 insertions(+), 196 deletions(-)

diff --git a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
index eb74a5d5..ece24751 100644
--- a/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
+++ b/src/main/java/itn/let/mjo/msgsent/service/MjonMsgSentVO.java
@@ -82,7 +82,14 @@ public class MjonMsgSentVO extends UserDefaultVO{
 	private String callFromComma;
 	private String callToComma;
 	private String msgSentType;
+	private String successCount;
 	
+	public String getSuccessCount() {
+		return successCount;
+	}
+	public void setSuccessCount(String successCount) {
+		this.successCount = successCount;
+	}
 	public String getMsgSentType() {
 		return msgSentType;
 	}
diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
index dbaa135d..855321be 100644
--- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
+++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgSent_SQL_mysql.xml
@@ -433,188 +433,143 @@
 	<!-- 전체 발송결과 조회  (전송사별) => 주소록 조인 제거버전-->
 	<select id="MjonMsgSentDAO.selectAllMsgSentSimpleList" parameterClass="mjonMsgSentVO" resultClass="mjonMsgSentVO">
 		SELECT
-			COUNT(USER_ID) OVER()					 AS totMsgCnt
-			, USER_ID								 AS userId
-			, MSG_GROUP_ID							 AS msgGroupId
-			, MSG_GROUP_CNT							 AS msgGroupCnt
-			, SMS_TXT								 AS smsTxt
-			, SUBJECT								 AS subject
-			, DATE_FORMAT(REGDATE, '%Y-%m-%d %T')	 AS regdate
-			, DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T')	 AS reqdate
-			, CALL_FROM								 AS callFrom
-			, CALL_TO								 AS callTo
-			, FN_GETHYPHEN(CALL_FROM)	AS callFromComma
-			, FN_GETHYPHEN(CALL_TO)		AS callToComma
-			, ''						 AS addrNm
-			, TOT_PRICE								 AS totPrice
-			, EACH_PRICE							 AS eachPrice
-			, CUR_STATE								 AS curState
-			, RSLT_CODE								 AS rsltCode
-			, RSLT_CODE2							 AS rsltCode2
-			, DEL_FLAG						 AS delFlag
-			, MSG_TYPE						 AS msgType
-			, FILE_CNT						 AS fileCnt
-			, AGENT_CODE					 AS agentCode
-			, RESERVE_C_YN					 AS reserveCYn
-			, CANCELDATE					 AS cancelDate
-			, ''							 AS msgId
-			, orderByCode					 AS orderByCode
-			, sendKind						 AS sendKind
-			, MSG_KIND						 AS msgKind
-		FROM
-			( SELECT
-				B.USER_ID
-				, B.MSG_GROUP_ID
-				, B.MSG_GROUP_CNT
-				, B.SMS_TXT
-				, B.SUBJECT
-				, B.REGDATE
-				, B.REQ_DATE
-				, B.CALL_FROM
-				, B.TOT_PRICE
-				, B.EACH_PRICE
-				, B.DEL_FLAG
-				, B.MSG_TYPE
-				, B.FILE_CNT
-				, B.AGENT_CODE
-				, B.RESERVE_C_YN
-				, B.CANCELDATE
-				, A.MSG_SEQ
-				, A.CALL_TO
-				, A.CUR_STATE
-				, A.RSLT_CODE
-				, A.RSLT_CODE2
-				, B.SEND_KIND as sendKind
-				, B.MSG_KIND
-				, CASE
-					WHEN B.MSG_TYPE = '6'
-						AND B.FILE_CNT > 0
-					THEN '3'
-					WHEN B.MSG_TYPE = '6'
-						AND B.FILE_CNT = 0
-					THEN '2'
-					ELSE '1'
-					END orderByCode
-				<include refid="MjonMsgSentDAO.selectJoinQuery"/>
-				AND B.USER_ID = #userId#
-				AND B.DEL_FLAG ='N'
-				AND B.RESERVE_C_YN = 'N'
-				<![CDATA[ 
-					AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
-				]]>
-				<isNotEmpty property="msgSentType">
-					<isEqual property="msgSentType" compareValue="01" >
-						AND B.MSG_KIND != 'C'
-					</isEqual>
-					<isEqual property="msgSentType" compareValue="02" >
-						AND B.MSG_KIND = 'C'
-					</isEqual>
-				</isNotEmpty>				
-			)M
-		WHERE 1=1 
-			<isNotEmpty property="stateType">
-				<isEqual property="stateType" compareValue="all">
-					AND CUR_STATE IN ('0','1','2','3')
-				</isEqual>
-				<isEqual property="stateType" compareValue="ready">
-					AND CUR_STATE = '0'
-					AND RESERVE_C_YN = 'N'
-				</isEqual>
-				<isEqual property="stateType" compareValue="complete">
-					AND CUR_STATE IN ('2','3')
-					AND (RSLT_CODE IN ('0','100','101','110','4100','6600','1000','1001')  OR 	 RSLT_CODE2 IN ('0') )
-					AND	 RESERVE_C_YN = 'N'
-				</isEqual>
-				<isEqual property="stateType" compareValue="fail">
-					AND RESERVE_C_YN = 'N'
-					AND (RSLT_CODE NOT IN ('0','100','101','110','4100','6600','1000','1001')  OR 	 RSLT_CODE2 NOT IN ('0') )
-				</isEqual>
-			</isNotEmpty>
-			<isNotEmpty property="searchMsgType">
-				<isEqual property="searchMsgType" compareValue="S">
-					AND MSG_TYPE = '4'
-				</isEqual>
-				<isEqual property="searchMsgType" compareValue="L">
-					AND MSG_TYPE = '6'
-					AND FILE_CNT = '0'
-				</isEqual>
-				<isEqual property="searchMsgType" compareValue="M">
-				<![CDATA[  
-					AND MSG_TYPE = '6'
-					AND FILE_CNT > '0'
-				]]>
-				</isEqual>
-			</isNotEmpty>
-			<isEmpty property="searchMsgType">
-				<isEmpty property="tabType">
-					AND MSG_TYPE IN ('4','6')
-				</isEmpty>
-			</isEmpty>
-			<isNotEmpty property="tabType">
-				<isEqual property="tabType" compareValue="all">
-					AND MSG_TYPE IN ('4','6')
-				</isEqual>
-				<isEqual property="tabType" compareValue="S">
-					AND MSG_TYPE = '4'
-				</isEqual>
-				<isEqual property="tabType" compareValue="L">
-					AND MSG_TYPE = '6'
-					AND FILE_CNT = '0'
-				</isEqual>
-				<isEqual property="tabType" compareValue="M">
-				<![CDATA[  
-					AND MSG_TYPE = '6'
-					AND FILE_CNT > '0'
-				]]>
-				</isEqual>
-			</isNotEmpty>
-			<isNotEmpty property="searchKeyword">
-				<isEqual property="searchCondition" compareValue="1" >
-					AND SUBJECT LIKE CONCAT('%', #searchKeyword#, '%')
-				</isEqual>
-				<isEqual property="searchCondition" compareValue="2" >
-					AND CALL_FROM LIKE CONCAT('%', #searchKeyword#, '%')
-				</isEqual>
-				<isEqual property="searchCondition" compareValue="3" >
-					AND CALL_TO LIKE CONCAT('%', #searchKeyword#, '%')
-				</isEqual>
-			</isNotEmpty>
-			<isNotEmpty property="searchCondition_01">
-				AND sendKind = #searchCondition_01#
-			</isNotEmpty>
-			<isNotEmpty property="startDate">
-				<![CDATA[ 
-					AND DATE_FORMAT(REGDATE, '%Y-%m-%d') >= DATE_FORMAT(#startDate#, '%Y-%m-%d')
-				]]>
-			</isNotEmpty>
-			<isNotEmpty property="endDate">
-				<![CDATA[ 
-					AND 	DATE_FORMAT(REGDATE, '%Y-%m-%d')  <=  DATE_FORMAT(#endDate#, '%Y-%m-%d')  
-				]]>
-			</isNotEmpty>
-			<isNotEmpty property="msgSentType">
-				<isEqual property="msgSentType" compareValue="01" >
-					AND MSG_KIND != 'C'
-				</isEqual>
-				<isEqual property="msgSentType" compareValue="02" >
-					AND MSG_KIND = 'C'
-				</isEqual>
-			</isNotEmpty>
-		GROUP BY MSG_GROUP_ID
-		ORDER BY 1=1
-		<isNotEmpty property="searchSortCnd">
-			<isEqual property="searchSortCnd" compareValue="curState">
-				, curState  $searchSortOrd$
-				, orderByrsltCode
-			</isEqual>
-			<isNotEqual  property="searchSortCnd" compareValue="curState">
+			M2.totMsgCnt
+			, M2.userId
+			, M2.msgGroupId
+			, M2.msgGroupCnt
+			, M2.smsTxt
+			, M2.subject
+			, M2.regdate
+			, M2.reqdate
+			, M2.callFrom
+			, M2.callFromComma
+			, (
+				SELECT FN_GETHYPHEN(CALL_TO) FROM MJ_MSG_DATA A
+				WHERE A.MSG_GROUP_ID = M2.msgGroupId
+				LIMIT 1
+			) AS callToComma
+			, (
+			SELECT
+					COUNT(0)
+				FROM
+					MJ_MSG_DATA A
+				WHERE 
+					A.MSG_GROUP_ID = M2.msgGroupId
+					AND (CASE
+							WHEN A.AGENT_CODE = '01' AND (A.RSLT_CODE = '100' AND (A.RSLT_CODE2 = '0'))
+							THEN 'S'
+							WHEN A.AGENT_CODE = '02' AND (A.RSLT_CODE = '0')
+							THEN 'S'
+							WHEN A.AGENT_CODE = '03' AND (A.RSLT_CODE = '100' OR A.RSLT_CODE = '101' OR A.RSLT_CODE = '110' OR A.RSLT_CODE = '800')
+							THEN 'S'
+							WHEN A.AGENT_CODE = '04' AND (A.RSLT_CODE = '4100' OR A.RSLT_CODE = '6600')
+							THEN 'S'
+							WHEN A.AGENT_CODE = '05' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
+							THEN 'S'
+							WHEN A.AGENT_CODE = '07' AND (A.RSLT_CODE = '6' OR A.RSLT_CODE = '1000')
+							THEN 'S'
+							WHEN A.AGENT_CODE = '08' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
+							THEN 'S'
+							WHEN A.AGENT_CODE = '09' AND (A.RSLT_CODE = '1000' OR A.RSLT_CODE = '1001')
+							THEN 'S'
+							ELSE 'F'
+						END) = 'S'
+			) AS successCount        						
+			, M2.addrNm
+			, M2.totPrice
+			, M2.eachPrice
+			, M2.delFlag
+			, M2.msgType
+			, M2.fileCnt
+			, M2.agentCode
+			, M2.reserveCYn
+			, M2.cancelDate
+			, M2.msgId
+			, M2.orderByCode
+			, M2.sendKind
+			, M2.msgKind
+		FROM (
+			SELECT
+				COUNT(USER_ID) OVER()					 AS totMsgCnt
+				, USER_ID								 AS userId
+				, MSG_GROUP_ID							 AS msgGroupId
+				, MSG_GROUP_CNT							 AS msgGroupCnt
+				, SMS_TXT								 AS smsTxt
+				, SUBJECT								 AS subject
+				, DATE_FORMAT(REGDATE, '%Y-%m-%d %T')	 AS regdate
+				, DATE_FORMAT(REQ_DATE, '%Y-%m-%d %T')	 AS reqdate
+				, CALL_FROM								 AS callFrom
+				, FN_GETHYPHEN(CALL_FROM)	AS callFromComma
+				, ''						 AS addrNm
+				, TOT_PRICE								 AS totPrice
+				, EACH_PRICE							 AS eachPrice
+				, DEL_FLAG						 AS delFlag
+				, MSG_TYPE						 AS msgType
+				, FILE_CNT						 AS fileCnt
+				, AGENT_CODE					 AS agentCode
+				, RESERVE_C_YN					 AS reserveCYn
+				, CANCELDATE					 AS cancelDate
+				, ''							 AS msgId
+				, orderByCode					 AS orderByCode
+				, sendKind						 AS sendKind
+				, MSG_KIND						 AS msgKind
+			FROM
+				( SELECT
+					B.USER_ID
+					, B.MSG_GROUP_ID
+					, B.MSG_GROUP_CNT
+					, B.SMS_TXT
+					, B.SUBJECT
+					, B.REGDATE
+					, B.REQ_DATE
+					, B.CALL_FROM
+					, B.TOT_PRICE
+					, B.EACH_PRICE
+					, B.DEL_FLAG
+					, B.MSG_TYPE
+					, B.FILE_CNT
+					, B.AGENT_CODE
+					, B.RESERVE_C_YN
+					, B.CANCELDATE
+					, B.SEND_KIND as sendKind
+					, B.MSG_KIND
+					, CASE
+						WHEN B.MSG_TYPE = '6'
+							AND B.FILE_CNT > 0
+						THEN '3'
+						WHEN B.MSG_TYPE = '6'
+							AND B.FILE_CNT = 0
+						THEN '2'
+						ELSE '1'
+						END orderByCode
+				FROM MJ_MSG_GROUP_DATA B
+	         	WHERE 
+					B.USER_ID = #userId#
+					AND B.DEL_FLAG ='N'
+					AND B.RESERVE_C_YN = 'N'
+					AND B.MSG_TYPE IN ('4','6')				
+					<![CDATA[ 
+						AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
+					]]>
+					<isNotEmpty property="msgSentType">
+						<isEqual property="msgSentType" compareValue="01" >
+							AND B.MSG_KIND != 'C'
+						</isEqual>
+						<isEqual property="msgSentType" compareValue="02" >
+							AND B.MSG_KIND = 'C'
+						</isEqual>
+					</isNotEmpty>				
+				)M
+			WHERE 1=1 
+			ORDER BY 1=1
+			<isNotEmpty property="searchSortCnd">
 				,$searchSortCnd$
-			</isNotEqual>
-		</isNotEmpty>
-		<isNotEmpty property="searchSortOrd">
-			$searchSortOrd$
-		</isNotEmpty>
-		LIMIT  #recordCountPerPage# OFFSET #firstIndex#	
+			</isNotEmpty>
+			<isNotEmpty property="searchSortOrd">
+			 	$searchSortOrd$
+			</isNotEmpty>
+			LIMIT  #recordCountPerPage# OFFSET #firstIndex#	
+		) M2
 	</select>	
 		
 	<!-- 전체 발송결과 조회  (개인별)-->
diff --git a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
index 9fc7f97e..f896f2ad 100644
--- a/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/msgdata/MsgSentListAjax.jsp
@@ -137,12 +137,12 @@ function fnRevDetailPop(msgGroupId, msgId, fileCnt){
 						<colgroup>
 							<col style="width: 17%;">
 							<col style="width: 7%;">
-							<col style="width: 7%;">
-							<col style="width: 11%;">
+							<col style="width: 6%;">
+							<col style="width: 10%;">
 							<col style="width: *%;">
 							<col style="width: 15%;">
-							<col style="width: 8%;">
 							<col style="width: 12%;">
+							<col style="width: 10%;">
 						</colgroup>
 						<thead>
 						<tr>
@@ -156,23 +156,15 @@ function fnRevDetailPop(msgGroupId, msgId, fileCnt){
 									<input type="button" class="sort sortBtn" id="sort_orderByCode">
 								</div>							
 							</th>
-							<th>방식
-								<div class="sort_wrap">
-									<input type="button" class="sort sortBtn" id="sort_sendKind">
-								</div>							
-							</th>
+							<th>방식</th>
 							<th>내용</th>
-							<th>받는사람
-								<div class="sort_wrap">
-									<input type="button" class="sort sortBtn" id="sort_callTo">
-								</div>							
-							</th>
+							<th>받는사람</th>
 							<th>발신번호
 								<div class="sort_wrap">
 									<input type="button" class="sort sortBtn" id="sort_callFrom">
 								</div>							
 							</th>
-							<th>건수
+							<th title="발송건수(성공률)">발송건수
 								<div class="sort_wrap">
 									<input type="button" class="sort sortBtn" id="sort_msgGroupCnt">
 								</div>							
@@ -256,7 +248,7 @@ function fnRevDetailPop(msgGroupId, msgId, fileCnt){
 										<c:out value="${result.callFromComma}"/>								
 									</td>
 									<td>
-										<c:out value="${result.msgGroupCnt}"/>
+										<fmt:formatNumber value="${result.msgGroupCnt}" pattern="#,###" />(<fmt:formatNumber value="${(result.successCount / result.msgGroupCnt) * 100}" pattern="#,###" />%)
 									</td>
 									<td>
 										<button class="btnType btnType24" onClick="javascript:fnMjMsgReSendAll('${result.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>								

From 14a693ed4ecfa5d940e518b81234d9276dbceebf Mon Sep 17 00:00:00 2001
From: rosewiper <rosehips@naver.com>
Date: Fri, 20 Oct 2023 12:50:59 +0900
Subject: [PATCH 26/26] =?UTF-8?q?=EC=B9=B4=ED=86=A1=EB=B0=9C=EC=86=A1=20>?=
 =?UTF-8?q?=20=EC=95=8C=EB=A6=BC=ED=86=A1=20=EC=84=A4=EC=A0=95=20=ED=95=98?=
 =?UTF-8?q?=EB=8B=A8=20FAQ=20=EB=82=B4=EC=9A=A9=EC=97=90=20=ED=83=9C?=
 =?UTF-8?q?=EA=B7=B8=20=EC=98=A4=EB=A5=98=20=EA=B0=9C=EC=84=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../stepInfo/web/KakaoStepInfoController.java | 68 ++++++++++++++++++-
 1 file changed, 67 insertions(+), 1 deletion(-)

diff --git a/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java b/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java
index d85d87b5..3dd67af8 100644
--- a/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java
+++ b/src/main/java/itn/let/kakao/user/stepInfo/web/KakaoStepInfoController.java
@@ -43,7 +43,7 @@ public class KakaoStepInfoController {
 	@Resource(name = "EgovFileMngService")
 	private EgovFileMngService fileService;
 	
-	
+
 	/**
 	* @Method Name : selectKaKaoStepInfo
 	* @Project : mjon
@@ -122,6 +122,25 @@ public class KakaoStepInfoController {
 		searchVO.setBbsId(boardVO.getBbsId());
 		BoardMasterVO bbsMasterInfo = bbsAttrbService.selectBBSMasterInf(searchVO);
 		
+		/**
+		 * FAQ 타이틀 및 내용에 대한 XSS 변환 태그 원복
+		 * faqUnscript() 를 이용하여 디비에 변환 태그로 되어있는 코드를 다시 원복 시킴
+		 * ret.replaceAll("&lt;", "<").replaceAll("&gt;", ">");
+		 * 
+		 * */
+		for(int i=0; i<resultList.size(); i++) {
+			
+			String nttSj = resultList.get(i).getNttSj();
+			String nttCn = resultList.get(i).getNttCn();
+			
+			nttSj = faqUnscript(nttSj);
+			nttCn = faqUnscript(nttCn);
+			
+			resultList.get(i).setNttSj(nttSj);
+			resultList.get(i).setNttCn(nttCn);
+			
+		}
+		
 		model.addAttribute("bbsMasterInfo", bbsMasterInfo);
 		model.addAttribute("resultList", resultList);
 		model.addAttribute("resultCnt", map.get("resultCnt"));
@@ -146,4 +165,51 @@ public class KakaoStepInfoController {
 		
 		return "/web/kakao/intrd/KakaoAllimtalkIntro";
 	}
+	
+	
+	/**
+	 * XSS 방지 처리.
+	 *
+	 * @param data
+	 * @return
+	 */
+	protected String faqUnscript(String data) {
+		if (data == null || data.trim().equals("")) {
+			return "";
+		}
+
+		String ret = data;
+
+		ret = ret.replaceAll("<(S|s)(C|c)(R|r)(I|i)(P|p)(T|t)", "&lt;script");
+		ret = ret.replaceAll("</(S|s)(C|c)(R|r)(I|i)(P|p)(T|t)", "&lt;/script");
+
+		ret = ret.replaceAll("<(O|o)(B|b)(J|j)(E|e)(C|c)(T|t)", "&lt;object");
+		ret = ret.replaceAll("</(O|o)(B|b)(J|j)(E|e)(C|c)(T|t)", "&lt;/object");
+
+		ret = ret.replaceAll("<(A|a)(P|p)(P|p)(L|l)(E|e)(T|t)", "&lt;applet");
+		ret = ret.replaceAll("</(A|a)(P|p)(P|p)(L|l)(E|e)(T|t)", "&lt;/applet");
+
+		ret = ret.replaceAll("<(E|e)(M|m)(B|b)(E|e)(D|d)", "&lt;embed");
+		ret = ret.replaceAll("</(E|e)(M|m)(B|b)(E|e)(D|d)", "&lt;embed");
+
+		ret = ret.replaceAll("<(F|f)(O|o)(R|r)(M|m)", "&lt;form");
+		ret = ret.replaceAll("</(F|f)(O|o)(R|r)(M|m)", "&lt;form");
+
+		//ret = ret.replaceAll("<", "&lt;");
+		//ret = ret.replaceAll(">", "&gt;");
+		ret = ret.replaceAll("alert", "");
+		ret = ret.replaceAll("iframe", "");
+		
+		ret = ret.replaceAll("&lt;", "<").replaceAll("&gt;", ">");
+		ret = ret.replaceAll("&#40;", "\\(").replaceAll("&#41;", "\\)");
+		ret = ret.replaceAll("'", "&#39;");
+		ret = ret.replaceAll("eval\\((.*)\\)", "");
+		ret = ret.replaceAll("[\\\"\\\'][\\s]*javascript:(.*)[\\\"\\\']", "\"\"");
+		ret = ret.replaceAll("script", "");
+		
+		return ret;
+	}
+	
+	
+	
 }