Commit @83c7303731fcc5c422829490af03d1f9e4c8909f

9ea2784

83c7303

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

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

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


 	
 	<!-- 사용자 요금 사용내역 Sum 리스트 -->
 	<select id="mjonMsgDAO.selectPayUserSumList" parameterClass="mjonMsgVO" resultClass="mjonMsgVO">		
-		/* 2024.01.26 검색 기준을 regdate 에서 reqdate로 기준을 잡자고 장건영팀장 요청으로 변경처리, sendCount는 사용하지 않아서 주석처리 */
+		/* 2024.01.26 검색 기준을 regdate 에서 reqdate로 기준을 잡자고 장건영팀장 요청으로 변경처리, msg_group_cnt는 사용하지 않아서 주석처리 */
+
 		SELECT
 			MAX(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )) AS maxRegDate
 			, MIN(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )) AS minRegDate 

9ea2784

83c7303

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


 						ADDR_PHONE_NO
 						, ADDR_NM
 					FROM
-						MJ_ADDR
+						MJ_ADDR AD
+						INNER JOIN MJ_ADDR_GRP ADG
+						ON AD.ADDR_GRP_ID = ADG.ADDR_GRP_ID
 						WHERE 1=1
-						AND MBER_ID = #userId#
+						AND AD.MBER_ID = #userId#
 					GROUP BY ADDR_PHONE_NO
 				)MA
 				ON M.CALL_TO = MA.ADDR_PHONE_NO

 						ADDR_PHONE_NO
 						, ADDR_NM
 					FROM
-						MJ_ADDR
+						MJ_ADDR AD
+						INNER JOIN MJ_ADDR_GRP ADG
+						ON AD.ADDR_GRP_ID = ADG.ADDR_GRP_ID 
 					WHERE
-						MBER_ID = #userId#
+						AD.MBER_ID = #userId#
 					GROUP BY
 						ADDR_PHONE_NO
 					)MA

9ea2784

83c7303

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

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

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

...	...	@@ -1004,6 +1004,13 @@
1004	1004
1005	1005	}else{ // 선택한 Row '-' 문자 삭제하기
1006	1006
	1007	+ //자동동보문자 2만건 초과시 발송 안되도록 처리함.
	1008	+ var totSendDataCnt = selectedData.length;
	1009	+ if(totSendDataCnt > 20000){
	1010	+ alert("자동동보문자를 한번에 20,000건 이상 보내실 경우에는 꼭 고객센터(010-8432-9333)로 연락주시어 발송 요청 후 진행해 주시길 바랍니다.");
	1011	+ return false;
	1012	+ }
	1013	+
1007	1014	for(var i=0; i < selectedData.length; i++){
1008	1015
1009	1016	//일괄변환 문자에 콤마(,)가 들어가있으면 배열로 넘길때 문제가 발생하여 특수문자(§)로 치환하여 넘겨주도록 한다.

9ea2784

83c7303

src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataSMLView.jsp

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


 <script type="text/javascript" src="<c:url value='/js/txtSpecialReplace.js?date=202304250001'/>"></script>
 
 <!--  -->
-<script type="text/javascript" src="<c:url value='/publish/js/publish.js'/>"></script>
+<script type="text/javascript" src="<c:url value='/publish/js/publish.js?date=202402060001'/>"></script>
 
 <style>
 /* .send_top .send_right .phone_bottom{display:flex;align-items:center;} */
 .send_top .send_right .send_rev{margin:0 !important;}
 .send_top .send_right .phone_bottom{bottom:130px;}
-.send_top .send_right .send_rev .send_content{padding:0 !important;;} 
+.send_top .send_right .send_rev .send_content{padding:0 !important;}
 </style>
 
 <% pageContext.setAttribute("newLineChar", "\r\n"); %>

         }
     });				
 }	
+
+
+
+//엔터키로 문자발송 처리해주기
+$(document).keypress(function(e){
+	
+	if(e.keyCode == 13 
+			&& !$(e.target).is('#smsTxtArea') 
+			&& !$(e.target).is('#callTo')
+			&& !$(e.target).is('#searchKeyword')
+			&& !$(e.target).is('#searchTxt')
+			&& !$(e.target).is('#id_text')
+			&& !$(e.target).is('#password_text')
+			&& !$(e.target).is('#searchWord')){
+		
+		enterSts = true;
+		fn_sendMsgData();
+		
+	}
+	
+});
 
 $(document).ready(function (){
 	

 		                    <div class="send_btn">
 		                        <button type="button" class="btnType btnType11" onclick="javascript:fn_sendMsgData(); return false;">발송하기</button>
 		                        <button type="button" class="btnType btnType10" onclick="javascript:fnTestSend(); return false;">테스트발송</button>
-		                    </div>
+		                    </div>		                    
+	                    </div>
+	                    <!-- 엔터키로 발송 체크박스 -->
+	                    <div class="use_enter">
+	                    	<input type="checkbox" id="enterChk" name="enterChk">
+	                    	<label for="enterChk">Enter키로 발송하기</label>
 	                    </div>
                         <div class="rev_selected">
                             <div class="rev_top">

9ea2784

83c7303

src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataView.jsp

--- src/main/webapp/WEB-INF/jsp/web/msgcampain/tw/MsgTWDataView.jsp

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


 var msgResendAllAdvertiseYn = "${msgResendAllAdvertiseYn}";
 var msgResendAllReplaceYn = "${msgResendAllReplaceYn}";
 
+var enterSts = false;
+
 $(document).ready(function(){
 	//문자 발송 화면 폼 불러오기
 	listMsgDataView();

 		
 	}
 	
+	var chkCalltoCnt =  $("input[name=chkCallTo]").length;
+	
+	if(Number(chkCalltoCnt) == 0){
+		
+		alert("받는사람을 추가해 주세요.");
+		return false;
+	}
+	
+	
 	//수신번호 리스트 체크하기
 	var numCnt = 0;
 	var nameList = [];		//치환문자 이름

 		
 	}
 	
-	if(confirm("문자를 전송하시겠습니까?")){
+	//엔터키로 문자 전송 바로 처리하기 : 엔터키와 엔터키 체크박스 둘다 조건 만족시 메시지 없이 전송처리
+	var enterChk = $("#enterChk").is(':checked');
+	if(!enterChk || !enterSts){
 		
+		if(!confirm("문자를 전송하시겠습니까?")){
+			return false;
+		}
+		
+	}
+	
+	//if(confirm("문자를 전송하시겠습니까?")){
 
 		imgFilePath = [];
 		$('.thumb_wrap').find('.thumb_img').each(function(idx, el) {

 			
 		}
 		
-	}
+	//}
 	
 }
 

9ea2784

83c7303

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

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

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


 
 /* 문자 예약 */
 .send_top .send_right .phone_bottom {position: absolute; bottom: 0; left: 0;}
-.send_top .send_right .send_rev {width: 310px; margin: 50px 0 0;}
+.send_top .send_right .send_rev {width: 310px; margin: 50px 0 0; position:relative;}
 .send_top .send_right .send_rev .rev_selected  {background-color: #f5f5f5;padding: 15px 0 15px 10px;border: 1px solid #d6d8da;border-radius: 10px;}
 .send_top .send_right .send_rev .rev_radio input[type="radio"]+label {color: #555;margin-right: 8px;} 
 .send_top .send_right .send_rev select+label {color: #555;font-weight: 300; font-size: 14px;}

 .send_top .send_right .send_rev .send_content .rev_radio ul li input[type=radio] + label {vertical-align:top;}
 .send_top .send_right .send_rev .send_content .send_btn {display:flex;width:245px;justify-content:space-between;}
 .send_top .send_right .send_rev .send_content .send_btn button {width:calc(100%/2 - 4px);height:60px;}
+.send_top .send_right .send_rev .use_enter {position:absolute; padding:3px 0 0 65px; display:flex;align-items:center;}
+.send_top .send_right .send_rev .use_enter label {font-size:16px!important; padding:0 0 0 4px; font-weight:400!important;}
 
 /* sub1 엑셀 문자(대량 전송) */
 .send_top .get_excel .send_right .phone {height: 93%; position: absolute; top: 0; right: 0;}

9ea2784

83c7303

src/main/webapp/publish/js/publish.js

--- src/main/webapp/publish/js/publish.js

+++ src/main/webapp/publish/js/publish.js

...	...	@@ -53,7 +53,7 @@
53	53
54	54	if (chkCnt == 0) {
55	55
56		- alert("받는사람을 추가해 주세요.");
	56	+ //alert("받는사람을 추가해 주세요.");
57	57	return false;
58	58
59	59	}

...	...	@@ -3494,7 +3494,8 @@
3494	3494
3495	3495	<!-- 사용자 요금 사용내역 Sum 리스트 -->
3496	3496	<select id="mjonMsgDAO.selectPayUserSumList" parameterClass="mjonMsgVO" resultClass="mjonMsgVO">
3497		- /* 2024.01.26 검색 기준을 regdate 에서 reqdate로 기준을 잡자고 장건영팀장 요청으로 변경처리, sendCount는 사용하지 않아서 주석처리 */
	3497	+ /* 2024.01.26 검색 기준을 regdate 에서 reqdate로 기준을 잡자고 장건영팀장 요청으로 변경처리, msg_group_cnt는 사용하지 않아서 주석처리 */
	3498	+
3498	3499	SELECT
3499	3500	MAX(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )) AS maxRegDate
3500	3501	, MIN(DATE_FORMAT(M.REQ_DATE, '%Y-%m-%d' )) AS minRegDate

...	...	@@ -357,9 +357,11 @@
357	357	ADDR_PHONE_NO
358	358	, ADDR_NM
359	359	FROM
360		- MJ_ADDR
	360	+ MJ_ADDR AD
	361	+ INNER JOIN MJ_ADDR_GRP ADG
	362	+ ON AD.ADDR_GRP_ID = ADG.ADDR_GRP_ID
361	363	WHERE 1=1
362		- AND MBER_ID = #userId#
	364	+ AND AD.MBER_ID = #userId#
363	365	GROUP BY ADDR_PHONE_NO
364	366	)MA
365	367	ON M.CALL_TO = MA.ADDR_PHONE_NO
...	...	@@ -719,9 +721,11 @@
719	721	ADDR_PHONE_NO
720	722	, ADDR_NM
721	723	FROM
722		- MJ_ADDR
	724	+ MJ_ADDR AD
	725	+ INNER JOIN MJ_ADDR_GRP ADG
	726	+ ON AD.ADDR_GRP_ID = ADG.ADDR_GRP_ID
723	727	WHERE
724		- MBER_ID = #userId#
	728	+ AD.MBER_ID = #userId#
725	729	GROUP BY
726	730	ADDR_PHONE_NO
727	731	)MA

...	...	@@ -25,6 +25,8 @@
25	25	var msgResendAllAdvertiseYn = "${msgResendAllAdvertiseYn}";
26	26	var msgResendAllReplaceYn = "${msgResendAllReplaceYn}";
27	27
	28	+var enterSts = false;
	29	+
28	30	$(document).ready(function(){
29	31	//문자 발송 화면 폼 불러오기
30	32	listMsgDataView();
...	...	@@ -957,6 +959,15 @@
957	959
958	960	}
959	961
	962	+ var chkCalltoCnt = $("input[name=chkCallTo]").length;
	963	+
	964	+ if(Number(chkCalltoCnt) == 0){
	965	+
	966	+ alert("받는사람을 추가해 주세요.");
	967	+ return false;
	968	+ }
	969	+
	970	+
960	971	//수신번호 리스트 체크하기
961	972	var numCnt = 0;
962	973	var nameList = []; //치환문자 이름
...	...	@@ -1033,8 +1044,17 @@
1033	1044
1034	1045	}
1035	1046
1036		- if(confirm("문자를 전송하시겠습니까?")){
	1047	+ //엔터키로 문자 전송 바로 처리하기 : 엔터키와 엔터키 체크박스 둘다 조건 만족시 메시지 없이 전송처리
	1048	+ var enterChk = $("#enterChk").is(':checked');
	1049	+ if(!enterChk \|\| !enterSts){
1037	1050
	1051	+ if(!confirm("문자를 전송하시겠습니까?")){
	1052	+ return false;
	1053	+ }
	1054	+
	1055	+ }
	1056	+
	1057	+ //if(confirm("문자를 전송하시겠습니까?")){
1038	1058
1039	1059	imgFilePath = [];
1040	1060	$('.thumb_wrap').find('.thumb_img').each(function(idx, el) {
...	...	@@ -1547,7 +1567,7 @@
1547	1567
1548	1568	}
1549	1569
1550		- }
	1570	+ //}
1551	1571
1552	1572	}
1553	1573

...	...	@@ -532,7 +532,7 @@
532	532
533	533	/* 문자 예약 */
534	534	.send_top .send_right .phone_bottom {position: absolute; bottom: 0; left: 0;}
535		-.send_top .send_right .send_rev {width: 310px; margin: 50px 0 0;}
	535	+.send_top .send_right .send_rev {width: 310px; margin: 50px 0 0; position:relative;}
536	536	.send_top .send_right .send_rev .rev_selected {background-color: #f5f5f5;padding: 15px 0 15px 10px;border: 1px solid #d6d8da;border-radius: 10px;}
537	537	.send_top .send_right .send_rev .rev_radio input[type="radio"]+label {color: #555;margin-right: 8px;}
538	538	.send_top .send_right .send_rev select+label {color: #555;font-weight: 300; font-size: 14px;}
...	...	@@ -554,6 +554,8 @@
554	554	.send_top .send_right .send_rev .send_content .rev_radio ul li input[type=radio] + label {vertical-align:top;}
555	555	.send_top .send_right .send_rev .send_content .send_btn {display:flex;width:245px;justify-content:space-between;}
556	556	.send_top .send_right .send_rev .send_content .send_btn button {width:calc(100%/2 - 4px);height:60px;}
	557	+.send_top .send_right .send_rev .use_enter {position:absolute; padding:3px 0 0 65px; display:flex;align-items:center;}
	558	+.send_top .send_right .send_rev .use_enter label {font-size:16px!important; padding:0 0 0 4px; font-weight:400!important;}
557	559
558	560	/* sub1 엑셀 문자(대량 전송) */
559	561	.send_top .get_excel .send_right .phone {height: 93%; position: absolute; top: 0; right: 0;}

...	...	@@ -9,13 +9,13 @@
9	9	<script type="text/javascript" src="<c:url value='/js/txtSpecialReplace.js?date=202304250001'/>"></script>
10	10
11	11	<!-- -->
12		-<script type="text/javascript" src="<c:url value='/publish/js/publish.js'/>"></script>
	12	+<script type="text/javascript" src="<c:url value='/publish/js/publish.js?date=202402060001'/>"></script>
13	13
14	14	<style>
15	15	/* .send_top .send_right .phone_bottom{display:flex;align-items:center;} */
16	16	.send_top .send_right .send_rev{margin:0 !important;}
17	17	.send_top .send_right .phone_bottom{bottom:130px;}
18		-.send_top .send_right .send_rev .send_content{padding:0 !important;;}
	18	+.send_top .send_right .send_rev .send_content{padding:0 !important;}
19	19	</style>
20	20
21	21	<% pageContext.setAttribute("newLineChar", "\r\n"); %>
...	...	@@ -604,6 +604,27 @@
604	604	}
605	605	});
606	606	}
	607	+
	608	+
	609	+
	610	+//엔터키로 문자발송 처리해주기
	611	+$(document).keypress(function(e){
	612	+
	613	+ if(e.keyCode == 13
	614	+ && !$(e.target).is('#smsTxtArea')
	615	+ && !$(e.target).is('#callTo')
	616	+ && !$(e.target).is('#searchKeyword')
	617	+ && !$(e.target).is('#searchTxt')
	618	+ && !$(e.target).is('#id_text')
	619	+ && !$(e.target).is('#password_text')
	620	+ && !$(e.target).is('#searchWord')){
	621	+
	622	+ enterSts = true;
	623	+ fn_sendMsgData();
	624	+
	625	+ }
	626	+
	627	+});
607	628
608	629	$(document).ready(function (){
609	630
...	...	@@ -4515,7 +4536,12 @@
4515	4536	<div class="send_btn">
4516	4537	<button type="button" class="btnType btnType11" onclick="javascript:fn_sendMsgData(); return false;">발송하기</button>
4517	4538	<button type="button" class="btnType btnType10" onclick="javascript:fnTestSend(); return false;">테스트발송</button>
4518		- </div>
	4539	+ </div>
	4540	+ </div>
	4541	+ <!-- 엔터키로 발송 체크박스 -->
	4542	+ <div class="use_enter">
	4543	+ <input type="checkbox" id="enterChk" name="enterChk">
	4544	+ <label for="enterChk">Enter키로 발송하기</label>
4519	4545	</div>
4520	4546	<div class="rev_selected">
4521	4547	<div class="rev_top">

Delete comment