Commit @53747d5c7e19102b3b67e93b4c0a4fd6e49f5725

ef57cc3

53747d5

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

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

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


 				<![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
 			(

ef57cc3

53747d5

src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp


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

ef57cc3

53747d5

src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp

+++ src/main/webapp/WEB-INF/jsp/web/msgdata/MsgDataSMLView.jsp


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

ef57cc3

53747d5

src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp

+++ src/main/webapp/WEB-INF/jsp/web/msgsent/MsgSentAllListAjax.jsp


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

...	...	@@ -319,6 +319,14 @@
319	319	<![CDATA[
320	320	AND B.REQ_DATE <= DATE_ADD(NOW(), INTERVAL 60 MINUTE)
321	321	]]>
	322	+ <isNotEmpty property="msgSentType">
	323	+ <isEqual property="msgSentType" compareValue="01" >
	324	+ AND B.MSG_KIND != 'C'
	325	+ </isEqual>
	326	+ <isEqual property="msgSentType" compareValue="02" >
	327	+ AND B.MSG_KIND = 'C'
	328	+ </isEqual>
	329	+ </isNotEmpty>
322	330	)M
323	331	LEFT JOIN
324	332	(

...	...	@@ -4078,11 +4078,9 @@
4078	4078	<div class="btn_popup_wrap">
4079	4079	<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
4080	4080	</div>
4081		- <%--
4082	4081	<div class="btn_popup_wrap">
4083	4082	<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
4084	4083	</div>
4085		- --%>
4086	4084	<div class="btn_popup_wrap check_validity_wrap">
4087	4085	<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
4088	4086	<div class="error_hover_cont send_hover_cont">

...	...	@@ -3878,11 +3878,9 @@
3878	3878	<div class="btn_popup_wrap">
3879	3879	<button type="button" data-tooltip="popup03" class="btnType btnType7 tab2">자주 보내는 번호</button>
3880	3880	</div>
3881		- <%--
3882	3881	<div class="btn_popup_wrap">
3883	3882	<button type="button" data-tooltip="popup05" class="btnType btnType7 tab2" onclick="getMjMsgSentListAll('1');">재전송</button>
3884	3883	</div>
3885		- --%>
3886	3884	<div class="btn_popup_wrap check_validity_wrap">
3887	3885	<button type="button" class="btnType btnType7 check_validity">오류 검사 <i class="qmMark"></i></button>
3888	3886	<div class="error_hover_cont send_hover_cont">

...	...	@@ -207,9 +207,7 @@
207	207	</td>
208	208	<td name="listTd">
209	209	<button class="btnType btnType20" data-tooltip="rev_popup01" onClick="javascript:fnRevDetailPop('${resultAllSentList.msgGroupId}','${resultAllSentList.msgId}','${resultAllSentList.fileCnt}'); return false;">상세보기</button>
210		- <%--
211	210	<button class="btnType btnType20" onClick="javascript:fnMjMsgReSendAll('${resultAllSentList.msgGroupId}','${replaceCnt}','${electionCnt}','${advertisementCnt}'); return false;">재전송</button>
212		- --%>
213	211	</td>
214	212	<td name="listTd">
215	213	<c:choose>

Delete comment