Merge branch 'master' into api_개선

.gitignore

@@ -198,3 +198,6 @@ fabric.properties
 rebel.xml
 /mvnw
 /mvnw.cmd
+
+# MacOS
+.DS_Store

src/main/java/itn/let/sym/site/service/JoinSettingVO.java

@@ -57,6 +57,7 @@ public class JoinSettingVO  {
 	private String slackNoti;  //관리자 SLACK 알림 여부
 	private String smishingNoti;	//첫결제(카드제외) 스미싱의심 알림 여부
 	private String holiSmishingNoti; //야간 스미싱알림 여부
+	private String smsNotiIfOverFifty; //50건이상 문자발송 시 안내문자 발송
 
 	
 }

src/main/resources/egovframework/sqlmap/let/sym/site/EgovSiteManage_SQL_Mysql.xml

@@ -984,6 +984,7 @@
 			IFNULL(SLACK_NOTI, 'N') AS slackNoti,
 			IFNULL(SMISHING_NOTI, 'N') AS smishingNoti,
 			IFNULL(HOLI_SMISHING_NOTI, 'N') AS holiSmishingNoti,
+			IFNULL(SMS_NOTI_IF_OVER_FIFTY, 'N') AS smsNotiIfOverFifty,
 			LAST_UPDUSR_ID AS lasUpdusrId,
 			LAST_UPDT_PNTTM AS lastUpdtPnttm
 		FROM MJ_MBER_SETTING
@@ -1001,6 +1002,7 @@
 			,SLACK_NOTI 	= #slackNoti#
 			,SMISHING_NOTI 	= #smishingNoti#
 			,HOLI_SMISHING_NOTI 	= #holiSmishingNoti#
+			,SMS_NOTI_IF_OVER_FIFTY = #smsNotiIfOverFifty#
 			,LAST_UPDUSR_ID = #lasUpdusrId#
 			,LAST_UPDT_PNTTM = NOW()
 			

src/main/webapp/WEB-INF/decorators.xml

@@ -25,20 +25,20 @@
 		<pattern>/sample_mjon/jsp_example_hstry_detail_r1.jsp</pattern>
 		<pattern>/sample_mjon/jsp_example_select_price_r1.jsp</pattern>
 		
+		
+		<pattern>/sample_mjon/jsp_example_start_form_r1.jsp</pattern>
 		<pattern>/sample_mjon/jsp_example_send_msg_form_r1.jsp</pattern>
 		<pattern>/sample_mjon/jsp_example_send_msgs_form_r1.jsp</pattern>
 		<pattern>/sample_mjon/jsp_example_hstry_form_r1.jsp</pattern>
 		<pattern>/sample_mjon/jsp_example_hstry_detail_form_r1.jsp</pattern>
 		<pattern>/sample_mjon/jsp_example_select_price_form_r1.jsp</pattern>
-		<pattern>/sample_mjon/jsp_example_start_form_r1.jsp</pattern>
 		<pattern>/sample_mjon/jsp_example_select_price_form_r1.jsp</pattern>
 		<pattern>/sample_mjon/*</pattern>
 		
-<!--		
-		<pattern>/sample_mjon/jsp_example_start_form_r1.jsp</pattern>
-		<pattern>/sample_mjon/jsp_example_select_price_form_r1.jsp</pattern>
 		<pattern>/sample_mjon/jsp_example_send_ft_form_r1.jsp</pattern>
-		<pattern>/sample_mjon/jsp_example_send_at_form_r1.jsp</pattern>-->
+		<pattern>/sample_mjon/jsp_example_send_at_form_r1.jsp</pattern>
+		<pattern>/sample_mjon/jsp_example_inqry_chnlid_form_r1.jsp</pattern>
+		<pattern>/sample_mjon/jsp_example_inqry_templates_list_form_r1.jsp</pattern>
 		
 		
 		

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp

@@ -1265,13 +1265,18 @@ function fnMberAdminSmsNoticeYn(){
 function fnMberSmishingYn(){
 	var form = document.mberManageVO;
 	var smishingYn = form.smishingYn.value;
+	var atSmishingYn = form.atSmishingYn.value;
 	
 	if(confirm("스미싱의심 여부를 변경하시겠습니까?")){
 		
 		$.ajax({
 	        type: "POST",
 	        url: "/uss/umt/user/EgovGnrlUpdateUserSmishingAjax.do",
-	        data: {"smishingYn" : smishingYn, "mberId" : "${mberManageVO.mberId}"},
+	        data: {
+	        	"smishingYn" : smishingYn
+	        	, "atSmishingYn" : atSmishingYn
+	        	, "mberId" : "${mberManageVO.mberId}"
+	        	},
 	        dataType:'json',
 	        async: false,
 	        success: function (data, status) {

src/main/webapp/WEB-INF/jsp/sym/site/adminNotiDetail.jsp

@@ -121,7 +121,15 @@
 								</select>
 								<input type="button" class="btnTypeAlim" value="예외 일정관리" onclick="javascript:fnAlimSetPopup(); return false;" style="margin-left:50px;">
 							</td>
-							
+						</tr>					
+						<tr>
+							<th>kisa 50건이상 안내문자 발송 여부</th>
+							<td>
+								<select name="smsNotiIfOverFifty" id="smsNotiIfOverFifty">
+									<option value="Y" <c:if test="${joinSettingVO.smsNotiIfOverFifty == 'Y'}">selected</c:if> >활성화</option>
+									<option value="N" <c:if test="${joinSettingVO.smsNotiIfOverFifty == 'N'}">selected</c:if> >비활성화</option>
+								</select>
+							</td>
 						</tr>					
 					</tbody>
 				</table>