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] =?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();	
+		}
 	}