From 4d810e63c855bdd04200de49555d0e5dc7ac3c90 Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Wed, 20 Dec 2023 18:35:30 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=B2=AD=EC=86=8C=EB=85=84/=EC=84=B1?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B0=95=EC=82=AC=EC=8B=A0=EC=B2=AD=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=20=EC=88=98=EC=A0=95=20=EA=B8=B0=EB=8A=A5=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EC=8B=A0=EA=B7=9C=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/OprtnInstrAdultPrflContoller.java     |  56 ++++
 .../adultVisitEdu/eduInstrFeeMngList.jsp      |   2 +-
 .../adultVisitEdu/instrAplctMngDetail.jsp     | 291 +++++++++++++++++-
 .../jsp/oprtn/adultVisitEdu/instrAplctReg.jsp |   6 +-
 .../adultVisitEdu/instrAplctRegExcel.jsp      |   2 +-
 .../cndtnSspnIdtmt/eduInstrFeeMngList.jsp     |   2 +-
 .../fndthEnhanceTrn/eduInstrFeeMngList.jsp    |   2 +-
 .../oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp |  28 +-
 .../tngrVisitEdu/instrAplctMngDetail.jsp      | 153 +++++++--
 .../jsp/oprtn/tngrVisitEdu/instrAplctReg.jsp  |   8 +-
 .../oprtn/tngrVisitEdu/instrAplctRegExcel.jsp |   2 +-
 .../tngrVisitEdu/instrAplctStngExcel.jsp      |   2 +-
 12 files changed, 494 insertions(+), 60 deletions(-)

diff --git a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java
index 129f6925..36c4631c 100644
--- a/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java
+++ b/src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java
@@ -1722,6 +1722,62 @@ public class OprtnInstrAdultPrflContoller {
 			return modelAndView;
 		}	
 		
+		/**
+		 * 2. 강사신청 수정 
+		 */
+		@RequestMapping("/ve/oprtn/instr/adultVisitEdu/instrInfo/instrAplctMngDetailUpdateAjax.do")
+		public ModelAndView instrAplctMngDetailUpdateAjax(
+				@ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO
+				, final MultipartHttpServletRequest multiRequest
+				, ModelMap model
+				, RedirectAttributes redirectAttributes
+				, HttpSession session
+				, HttpServletRequest request
+				) throws Exception {
+			
+			ModelAndView modelAndView = new ModelAndView();
+			modelAndView.setViewName("jsonView");
+			
+			//로그인 처리====================================
+			//로그인 정보 가져오기
+	        LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+	        
+	        String atchFileId = "";
+			final Map<String, MultipartFile> files = multiRequest.getFileMap();
+			
+			if (!files.isEmpty()) {
+				//XXX_로 첨부파일 네이밍
+				List<FileVO> result = egovFileMngUtil.parseFileInf(files, "PHT_", 0, "", "", "");
+				atchFileId = fileMngService.insertFileInfs(result);
+			}
+			//첨부파일Id(atchFileId)를 해당 VO atchFileId변수에 저장
+			vEInstrDetailVO.setPhtAtchFileId(atchFileId);
+			
+			//세션 ID 가져오기
+			vEInstrDetailVO.setLastUpdusrId(loginVO.getUniqId());
+			
+			//제출, 승인요청 일시
+			SimpleDateFormat format1 = new SimpleDateFormat ( "yyyy-MM-dd HH:mm:ss");
+			Date time = new Date();
+			String now = format1.format(time);
+			if("Y".equals(vEInstrDetailVO.getSbmtYn())) {
+				vEInstrDetailVO.setSbmtPnttm(now);
+			}
+	        
+	        vEInstrService.update(vEInstrDetailVO);
+			//등록 요청, 재요청일 시 반려사유 삭제
+			if("10".equals(vEInstrDetailVO.getAprvlCd())) {
+				vEInstrDetailVO.setAprvlCn("");
+			}
+			
+			//암호화
+			vEInstrDetailVO	=	egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVO);/*이름, 번호 복호화*/
+			vEInstrDetailService.update(vEInstrDetailVO);
+			modelAndView.addObject("result", "success");
+			
+			return modelAndView;
+		}	
+		
 		////////////////////////////////////////////////////////////////
 		//
 		//	private function
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp
index ebd2c9b5..6366277d 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduInstrFeeMngList.jsp
@@ -192,7 +192,7 @@
 			$('input:checkbox[name="chk"]:checked').each(function() {
 			sendSms(
 					$(this).data('instrphone'),
-					"교육운영 관리 시스템입니다." + $(this).data('instrnm')+"님의 " + $(this).data('date') + " 교육 강사료는 " + $(this).data('instrfeesum') +"입니다.", 
+					"교육운영 관리 시스템입니다." + $(this).data('instrnm')+"님의 " + $(this).data('date') + " 교육 강사료는 " + $(this).data('instrfeesum') +"원입니다.", 
 					$(this).val().split('@')[0],
 					$(this).data('userid'),
 					"N"
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngDetail.jsp
index 8c687d8b..2e40ac90 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctMngDetail.jsp
@@ -28,7 +28,114 @@
 <head>
 <meta http-equiv="Content-Language" content="ko" >
 <title>전자교육신청 상세</title>
+<script type="text/javascript" src="<c:url value="/validator.do"/>"></script>
+<validator:javascript formName="vEInstrDetailVO" staticJavascript="false" xhtml="true" cdata="false" />
 <script type="text/javaScript" language="javascript">
+	$(document).ready(function(){
+		
+		//핸드폰 번호 넣어주기
+		var phoneAll = "${info.phone}"
+		var phoneReplace = phoneAll.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/,"$1-$2-$3");
+		var phone_arr = phoneReplace.split("-");
+		for(var i=0; i<phoneReplace.split("-").length; i++){
+			$("#phone"+(i+1)).val(phone_arr[i]);
+		};
+		
+		//이메일 넣어주기
+		var emailAll = "${info.email}"
+		var email_arr = emailAll.split("@");
+		for(var i=0; i<emailAll.split("@").length; i++){
+			$("#email"+(i+1)).val(email_arr[i]);
+		};
+		
+		//이메일과 selectbox의 이메일이 동일하다면 selected
+		$('#emailSelect option').each(function(){
+			 if (this.value == email_arr[1] && this.value != "") {
+				 $(this).attr("selected","selected");
+				 $("#email2").attr("readonly", true);
+			} 
+		});
+		
+		
+		//현재년도
+		var date = new Date();
+		var year = date.getFullYear();
+		
+		//생년월일, 위촉년도 selectbox
+		getYears(year);
+		
+		//생년월일 selected 처리
+		/* 941024 형태(엑셀등록) or 19941024 형태 둘다 처리 */
+		var dBirth = "${info.dBirth}"
+		if(dBirth.length == '6'){
+			var dBirth1 = dBirth.substring(0,2);    	
+			var dBirth2 = dBirth.substring(2,4);
+			var dBirth3 = dBirth.substring(4,6);
+			if(dBirth1.substring(0,1) == "0"){
+				dBirth1 = "20"+dBirth1
+			}else{
+				dBirth1 = "19"+dBirth1
+			}
+			if(dBirth2.substring(0,1) == "0"){
+				dBirth2 = dBirth2.substring(1,2);
+			}
+			if(dBirth3.substring(0,1) == "0"){
+				dBirth3 = dBirth3.substring(1,2);
+			}
+			
+			$('#dBirth1 option').each(function(){
+				 if (this.value == dBirth1) {
+					 $(this).attr("selected","selected");
+					}
+			});
+			$('#dBirth2 option').each(function(){
+				 if (this.value == dBirth2) {
+					 $(this).attr("selected","selected");
+					}
+			}); 
+			$('#dBirth3 option').each(function(){
+				 if (this.value == dBirth3) {
+					 $(this).attr("selected","selected");
+					}
+			});
+		}else{
+			var dBirth1 = dBirth.substring(0,4);    	
+			var dBirth2 = dBirth.substring(4,6);
+			var dBirth3 = dBirth.substring(6,8);
+			if(dBirth2.substring(0,1) == "0"){
+				dBirth2 = dBirth2.substring(1,2);
+			}
+			if(dBirth3.substring(0,1) == "0"){
+				dBirth3 = dBirth3.substring(1,2);
+			}
+			
+			$('#dBirth1 option').each(function(){
+				 if (this.value == dBirth1) {
+					 $(this).attr("selected","selected");
+					}
+			});
+			$('#dBirth2 option').each(function(){
+				 if (this.value == dBirth2) {
+					 $(this).attr("selected","selected");
+					}
+			}); 
+			$('#dBirth3 option').each(function(){
+				 if (this.value == dBirth3) {
+					 $(this).attr("selected","selected");
+					}
+			});
+		}	
+
+		//위촉년도 selected 처리
+		var apptYr = "${info.apptYr}"
+		
+		$('#apptYr option').each(function(){
+			 if (this.value == apptYr) {
+				 $(this).attr("selected","selected");
+				}
+		});
+		
+	});
 	function fn_egov_downFile(atchFileId, fileSn){
 		window.open("<c:url value='/cmm/fms/FileDown.do?atchFileId="+atchFileId+"&fileSn="+fileSn+"'/>");
 	}
@@ -138,7 +245,106 @@
 		commonPopWindowopenForm("${pageContext.request.contextPath}/ve/oprtn/instr/adultVisitEdu/instrInfo/instrAplctCmpnnPopup.do", "750", "660", "instrMdfyRqstPop", $('#detailForm'));
 	}
 	
+	function fncAreaList(paramObj) {
+		commonPopWindowopenForm("${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/popup/instrInfo/rsdncPopList.do", "750", "660", "securityPop", $('#detailForm'));
+	}
 
+	//위촉년도 최근년도 뿌려주기
+    function getYears(getYear){
+    	
+    	var startY = Number(getYear)- 99;
+    	var endY = Number(getYear);
+    	
+    	for(var y=endY; y>=startY; y--){
+    		$("#apptYr").append("<option value='" + y + "'>" + y + "</option>");
+    		$("#dBirth1").append("<option value='" + y + "'>" + y + "</option>");
+    	}
+    	
+    	for(var m=1; m<=12; m++){
+    		$("#dBirth2").append("<option value='" + m + "'>" + m + "</option>");
+    	}
+    	
+    	for(var d=1; d<=31; d++){
+    		$("#dBirth3").append("<option value='" + d + "'>" + d + "</option>");
+    	}
+    }
+	
+	function fncUpdate(){
+    	//핸드폰번호 하이푼 추가
+		 var phoneAll = document.getElementById("phone1").value + "-"+ document.getElementById("phone2").value + "-"+ document.getElementById("phone3").value; 
+  	 	 $("#phone").val(phoneAll)
+		//이메일 합치기
+		var emailAll = document.getElementById("email1").value + "@"+ document.getElementById("email2").value ;
+   	 	$("#email").val(emailAll)
+		//생년월일합치기, 8자리 맞추기
+    	var dBirth1 = $("#dBirth1 option:selected").val()
+    	var dBirth2 = $("#dBirth2 option:selected").val()
+    	var dBirth3 = $("#dBirth3 option:selected").val()
+    	if(dBirth2.length == 1){
+    		dBirth2 = "0"+dBirth2;
+    	}
+    	if(dBirth3.length == 1){
+    		dBirth3 = "0"+dBirth3;
+    	}
+		var dBirthAll = dBirth1 + dBirth2 + dBirth3
+		$("#dBirth").val(dBirthAll)		
+	   	/*
+	   	<!-- for validator #3 -->
+	   	*/
+	   	if (!validateVEInstrDetailVO(document.detailForm)) return;
+	   	/*
+	   	<!-- for validator #3 -->
+	   	*/
+	   	
+	   	/* value에 기본적으로 - 또는 @ 들어가서 필수 값 체크 따로 */
+	    	if($("#phone1").val() == '' || $("#phone2").val() == '' || $("#phone3").val() == ''){
+	   		alert("연락처는 필수입니다.");
+	   		return false;
+	   	}
+	    	if($("#email1").val() == '' || $("#email2").val() == ''){
+	   		alert("이메일은 필수입니다.");
+	   		return false;
+	   	}
+	    	
+	    	/* 청소년 강사와 다른 성인 강사 항목. 공통 validator에 없음 */
+	   	if($("#prfsnFld").val() == ''){
+	   		alert("전문분야는 필수입니다.");
+	   		return false;
+	   	}
+	   	
+		var data = new FormData(document.getElementById("detailForm"));
+        if(confirm("수정 하시겠습니까?")){
+            $.ajax({
+                type: "POST",
+                enctype: 'multipart/form-data',
+                url: "${pageContext.request.contextPath}/ve/oprtn/instr/adultVisitEdu/instrInfo/instrAplctMngDetailUpdateAjax.do",
+                data: data,
+                dataType:'json',
+                async: false,
+                processData: false,
+                contentType: false,
+                cache: false,
+                success: function (returnData, status) {
+                    if(status == 'success'){
+                    	alert("수정 처리 완료하였습니다.");
+                    	fncGoList(); 
+                    } else if(status== 'fail'){
+                        alert("수정 처리 실패하였습니다.");
+                    }
+                },
+                error: function (e) { alert("수정 처리에 실패하였습니다."); console.log("ERROR : ", e); }
+            });
+		}
+	}
+	
+	function emailChange(email){
+		if(email.value != ""){
+			document.getElementById("email2").readOnly = true;
+		}else{
+			document.getElementById("email2").readOnly = false;
+		}
+		document.getElementById("email2").value = email.value;
+	}
 </script>
 </head>
 <body>
@@ -160,6 +366,9 @@
 	<input type="hidden" name="aprvlCd" id="aprvlCd" value=""/> <!-- 승인코드 -->
 	<input type="hidden" name="aprvlCn" id="aprvlCn" value="<c:out value='${info.instrDiv}'/>"/> <!-- 승인내용(반려사유) -->
 	<input type="hidden" name="rqstType" id="rqstType" value=""/> <!-- 요청유형 -->
+	<input type="hidden" name="phone" id="phone" value=""/> <!-- 연락처 -->
+	<input type="hidden" name="email" id="email" value=""/> <!-- 이메일 -->
+	<input type="hidden" name="dBirth" id="dBirth" value=""/> <!-- 생년월일 -->
 <!-- cont -->
 	<div class="cont_wrap">
 		<div class="box">
@@ -196,7 +405,8 @@
 									<p>강사명</p>
 								</th>
 								<td colspan="3" style="position: relative;">
-									<c:out value='${info.instrNm}' />
+									<label for="instrNm" class="label">강사명</label>
+									<input type="text" name="instrNm" id="instrNm" size="25" value="<c:out value='${info.instrNm}'/>" maxLength="20" placeholder="홍길동">
 									<div class="put_photo">
 										<div class="put_photo_in">
 											<div class="put_photo_box">
@@ -215,69 +425,121 @@
 								<th scope="row">
 									<p>연락처(핸드폰)</p>
 								</th>
-								<td class="input_phone" colspan="3"><c:out value='${info.phone}' /></td>
+								<td class="input_phone" colspan="3">
+									<input type="text" title="휴대폰 앞자리" id="phone1" placeholder="" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');" maxLength="4">
+									-
+									<input type="text" title="휴대폰 중간자리" id="phone2" placeholder="" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');" maxLength="4">
+									-
+									<input type="text" title="휴대폰 마지막자리"  id="phone3" placeholder="" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');" maxLength="4">
+								</td>
 							</tr>
 							<tr>
 								<th scope="row">
 									<p>e-mail</p>
 								</th>
-								<td colspan="3"><c:out value='${info.email}' /></td>
+								<td colspan="3">
+		                        	<label for="email" class="label">e-mail</label>
+		                            <%-- <input type="text" size="50" name="email" id="email" value="<c:out value='${info.email}'/>" maxLength="50"> --%>
+									<input type="text" id="email1" size="20" title="이메일 주소 입력" placeholder="">
+									@
+									<input type="text" id="email2" size="20" title="이메일 직접 입력" placeholder="">
+									<label for="emailSelect" class="label">이메일 선택</label>
+									<select name="emailSelect" id="emailSelect" class="sel_type1" onchange="emailChange(this)">
+										<option value="">직접입력</option>
+										<option value="naver.com">naver.com</option>
+										<option value="daum.net">daum.net</option>
+										<option value="gmail.com">gmail.com</option>
+									</select>
+								</td>
 							</tr>
 							<tr class="input_adress">
 								<th scope="row">
 									<p>주소</p>
 								</th>
 								<td colspan="3">
-									<c:out value='${info.post}' /></br>
-									<c:out value='${info.addr}' />&nbsp;<c:out value='${info.addrDetail}' />
+									<label for="post" class="label">우편번호 입력</label>
+									<input type="text" size="20" name="post" id="post" class="adr_input" style="background-color: #eee;" value="<c:out value='${info.post}'/>" readonly>
+									<button class="btn_type08 btn_adr_search" onclick="fn_postCode(this); return false;">우편번호 검색</button>
+									<div class="detail_address">
+										<label for="addr" class="label">주소 입력</label>
+										<input type="text" size="60" name="addr" id="addr"  class="searchResultAddr" value="<c:out value='${info.addr}'/>" readonly>
+										<label for="addrDetail" class="label">나머지 주소 입력</label>
+										<input type="text" size="20" name="addrDetail" id="addrDetail" class="usrInsertAddr" value="<c:out value='${info.addrDetail}'/>" maxLength="100" placeholder="나머지 주소">
+									</div>
 								</td>
 							</tr>
 							<tr>
 								<th scope="row">
 									<p>거주지</p>
 								</th>
-								<td colspan="3"><c:out value='${info.rsdne}'/></td>
+								<td colspan="3">
+									<input type="text" title="거주지" size="25" placeholder="ex) 경기(군포시 용포동)" readonly="readonly"
+									value="<c:out value='${info.rsdne}'/>" maxLength="20" name="rsdne" id="rsdne">
+									<button type="button" class="btn_type01" data-tooltip="sub26_pop01" onclick="fncAreaList();return false;">선택</button>
+									<input type="hidden" name="rsdneId" id="rsdneId" value=""/><!-- 거주지ID -->
+								</td>
 							</tr>
 							<tr>
 								<th scope="row">
 									<p>생년월일</p>
 								</th>
-								<td colspan="3"><c:out value='${info.dBirth}'/></td>
+								<td colspan="3">
+									<label for="dBirth1" class="label">생년월일 년입력</label>
+		                            <select name="dBirth1" id="dBirth1" class="sel_type1">
+									</select>		                            
+		                            <label for="dBirth2" class="label">생년월일 월입력</label>
+		                            <select name="dBirth2" id="dBirth2" class="sel_type1">
+									</select>		                            
+		                            <label for="dBirth3" class="label">생년월일 일입력</label>
+		                            <select name="dBirth3" id="dBirth3" class="sel_type1">
+		                            <%-- <input type="text" name="dBirth" id="dBirth" size="20" maxlength="6"  placeholder="예) 951028" value="<c:out value='${info.dBirth}'/>" oninput="this.value = this.value.replace(/[^0-9.]/g, '').replace(/(\..*)\./g, '$1');"> --%>
+									</select>
+								</td>
 							</tr>
 							<tr>
 								<th scope="row">
 									<p>소속</p>
 								</th>
-								<td><c:out value='${info.blng}' /></td>
+								<td>
+									<input type="text" name="blng" id="blng" size="20"  value="<c:out value='${info.blng}'/>" maxLength="20">
+								</td>
 								<th scope="row">
 									<p>직위</p>
 								</th>
-								<td><c:out value='${info.pstn}' /></td>
+								<td>
+									<input type="text" name="pstn" id="pstn" size="20" maxlength="20" placeholder=""  value="<c:out value='${info.pstn}'/>">
+								</td>
 							</tr>
 							<tr>
 								<th scope="row">
 									<p>위촉년도</p>
 								</th>
-								<td><c:out value='${info.apptYr}' /></td>
+								<td>
+									<select name="apptYr" id="apptYr" class="sel_type1">
+									</select>					
+								</td>
 								<th scope="row">
 									<p>구분</p>
 								</th>
-								<td><ve:code codeId="VE0018" code="${info.divCd}"/></td>
+								<td>
+									<ve:select codeId="VE0018" name="divCd" id="divCd" selectedValue="${info.divCd}" styleClass="sel_type1"/>
+								</td>
 							</tr>
-							<tr>
+							<%-- <tr>
 								<th scope="row">
 									<p>위촉구분${info.apptDiv}</p>
 								</th>
 								<td colspan="3">
 									<ve:code codeId="VE0032" code="${info.apptDiv}"/>
 								</td>
-							</tr>							
+							</tr>	 --%>						
 							<tr>
 								<th scope="row">
 									<p>전문분야</p>
 								</th>
 								<td colspan="3">
-									<c:out value='${info.prfsnFld}' />
+									<textarea name="prfsnFld" id="prfsnFld" placeholder="ex)예문
+- SW코딩, 사물인터넷,인공지능,인성, 비젼, 캠프, 인터넷중독, 가족치료, 저작권 개론 등"><c:out value='${info.prfsnFld}'/></textarea>
 								</td>
 							</tr>
 						</tbody>
@@ -295,6 +557,7 @@
 							<button type="button" class="btn_type02" onclick="fncSave(); return false;">위촉확인</button>
 						</c:if>
 <!-- 						<button type="button" class="btn_type02" onclick="fncPopup('30', 'RR'); return false;">반려</button> -->
+							<button type="button" class="btn_type03" onclick="fncUpdate(); return false;">수정</button>
 							<button type="button" class="btn_type03" onclick="fncDelete(); return false;">삭제</button>
 							<button type="button" class="btn_type03" onclick="fncGoList(); return false;">취소</button>
 							<!-- 					
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp
index 4c62dd0d..9106fbb1 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctReg.jsp
@@ -251,11 +251,13 @@ $( document ).ready(function(){
 	
 	function fncRsdnePopup() { //거주지 팝업
 		
-	    document.createForm.action = "<c:url value='/ve/oprtn/instr/adultVisitEdu/popup/instrRsdnePopup.do'/>";
+	    /* document.createForm.action = "<c:url value='/ve/oprtn/instr/adultVisitEdu/popup/instrRsdnePopup.do'/>";
 	    window.open("#", "_rsdnePopup", "scrollbars = no, top=100px, left=100px, height=450px, width=450px");    
 	    document.createForm.target = "_rsdnePopup";
 	    document.createForm.formId.value = "createForm";
-	    document.createForm.submit();  
+	    document.createForm.submit();   */
+	    
+	    commonPopWindowopenForm("${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/popup/instrRsdnePopup.do", "750", "660", "rsdnePopup", $('#createForm'));
 	}	
 	
 	function fncPhotoPopup() {
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctRegExcel.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctRegExcel.jsp
index 95240de9..97254151 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctRegExcel.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrAplctRegExcel.jsp
@@ -486,7 +486,7 @@ $( document ).ready(function(){
 		                                        <button type="button" class="btnType btnType9"
 		                                        onclick="document.all.file.click(); return false;"
 		                                        >파일첨부</button>
-		                                        <span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="https://www.copyright.or.kr/offedu/cmm/fms/FileDown.do?atchFileId=FILE_000000000018233&fileSn=0" target="_blank">sample</a></span>
+		                                        <span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001280&fileSn=0" target="_blank">sample</a></span>
 		                                    </td>	
 						</tr>						
 					</tbody>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/eduInstrFeeMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/eduInstrFeeMngList.jsp
index 42ab441d..c8f6dfaa 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/eduInstrFeeMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/eduInstrFeeMngList.jsp
@@ -252,7 +252,7 @@
 			$('input:checkbox[name="chk"]:checked').each(function() {
 			sendSms(
 					$(this).data('instrphone'),
-					"교육운영 관리 시스템입니다." + $(this).data('instrnm')+"님의 " + $(this).data('date') + " 교육 강사료는 " + $(this).data('instrfeesum') +"입니다.", 
+					"교육운영 관리 시스템입니다." + $(this).data('instrnm')+"님의 " + $(this).data('date') + " 교육 강사료는 " + $(this).data('instrfeesum') +"원입니다.", 
 					$(this).val().split('@')[0],
 					$(this).data('userid'),
 					"N"
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/eduInstrFeeMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/eduInstrFeeMngList.jsp
index 42c8602a..8e311938 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/eduInstrFeeMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/eduInstrFeeMngList.jsp
@@ -252,7 +252,7 @@
 			$('input:checkbox[name="chk"]:checked').each(function() {
 			sendSms(
 					$(this).data('instrphone'),
-					"교육운영 관리 시스템입니다." + $(this).data('instrnm')+"님의 " + $(this).data('date') + " 교육 강사료는 " + $(this).data('instrfeesum') +"입니다.", 
+					"교육운영 관리 시스템입니다." + $(this).data('instrnm')+"님의 " + $(this).data('date') + " 교육 강사료는 " + $(this).data('instrfeesum') +"원입니다.", 
 					$(this).val().split('@')[0],
 					$(this).data('userid'),
 					"N"
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp
index b1386b10..173a18a1 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduInstrFeeMngList.jsp
@@ -34,6 +34,7 @@
 			background-color: #ededed;
 		}
 	</style>
+	<script src="${pageContext.request.contextPath}/js/ve/sendSmsEmailUtil.js"></script>
 	<script type="text/javascript">
 		$(document).ready(function(){
 
@@ -180,6 +181,26 @@
 			});
 		}
 		
+		function chkSendSms(){
+			var chkLen = $(listForm).find("input[name=chk]:checked").length;
+			
+			if(chkLen == 0){
+				alert("선택된 항목이 없습니다.");
+				return;
+			}
+
+			$('input:checkbox[name="chk"]:checked').each(function() {
+			sendSms(
+					$(this).data('instrphone'),
+					"교육운영 관리 시스템입니다." + $(this).data('instrnm')+"님의 " + $(this).data('date') + " 교육 강사료는 " + $(this).data('instrfeesum') +"원입니다.", 
+					$(this).val().split('@')[0],
+					$(this).data('userid'),
+					"N"
+				);
+			});
+			alert("발송되었습니다.");
+			
+		}
 	</script>
 	<title>신청관리</title>
 </head>
@@ -310,7 +331,11 @@
 						<c:forEach var="list" items="${list}" varStatus="status">
 							<tr>
 								<td>
-									<input name="chk" class="${list.atchFileId}" value="${list.eduAplctOrd}@${list.eduChasiOrd}" title="Check" type="checkbox"/>
+									<input name="chk" class="${list.atchFileId}" value="${list.eduAplctOrd}@${list.eduChasiOrd}"
+									data-instrphone="<c:out value='${list.instrPhone}' />" data-userid="<c:out value='${list.userId}' />" 
+									data-date="<c:out value='${list.eduHopeDt}' /> <c:out value='${list.strtTm}' /> ~ <c:out value='${list.endTm}' />"
+									data-instrnm="<c:out value='${list.instrNm}' />" data-instrfeesum="<c:out value='${list.instrFeeSum}' />"
+									title="Check" type="checkbox"/>
 								</td>
 								<td>
 									<c:if test="${list.cnt eq 0}">미제출</c:if><c:if test="${list.cnt gt 0}">제출</c:if>
@@ -383,6 +408,7 @@
 					<div class="btn_left">
 <!-- 						<button type="button" class="btn_type06" onclick="fnAcmdtFileZipDownload(); return false;">숙박영수증다운로드</button> -->
 						<button type="button" class="btn_type06" onclick="excelDownLoad();">지급내역다운로드</button>
+						<button type="button" class="btn_type06" onclick="chkSendSms();">강사료 안내 문자발송</button>
 					</div>
 					<div class="btn_center">
 					</div>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctMngDetail.jsp
index bbfb924b..127bcf4e 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctMngDetail.jsp
@@ -28,6 +28,8 @@
 <head>
 <meta http-equiv="Content-Language" content="ko" >
 <title>강사정보 상세</title>
+<script type="text/javascript" src="<c:url value="/validator.do"/>"></script>
+<validator:javascript formName="vEInstrDetailVO" staticJavascript="false" xhtml="true" cdata="false" />
 <script type="text/javaScript" language="javascript">
 	$( document ).ready(function(){
 		$(".put_photo_box").on("DOMSubtreeModified", function(){
@@ -65,37 +67,67 @@
 		getYears(year);
 		
 		//생년월일 selected 처리
+		/* 941024 형태(엑셀등록) or 19941024 형태 둘다 처리 */
 		var dBirth = "${info.dBirth}"
-		var dBirth1 = dBirth.substring(0,2);    	
-		var dBirth2 = dBirth.substring(2,4);
-		var dBirth3 = dBirth.substring(4,6);
-		if(dBirth1.substring(0,1) == "0"){
-			dBirth1 = "20"+dBirth1
+		if(dBirth.length == '6'){
+			var dBirth1 = dBirth.substring(0,2);    	
+			var dBirth2 = dBirth.substring(2,4);
+			var dBirth3 = dBirth.substring(4,6);
+			if(dBirth1.substring(0,1) == "0"){
+				dBirth1 = "20"+dBirth1
+			}else{
+				dBirth1 = "19"+dBirth1
+			}
+			if(dBirth2.substring(0,1) == "0"){
+				dBirth2 = dBirth2.substring(1,2);
+			}
+			if(dBirth3.substring(0,1) == "0"){
+				dBirth3 = dBirth3.substring(1,2);
+			}
+			
+			$('#dBirth1 option').each(function(){
+				 if (this.value == dBirth1) {
+					 $(this).attr("selected","selected");
+					}
+			});
+			$('#dBirth2 option').each(function(){
+				 if (this.value == dBirth2) {
+					 $(this).attr("selected","selected");
+					}
+			}); 
+			$('#dBirth3 option').each(function(){
+				 if (this.value == dBirth3) {
+					 $(this).attr("selected","selected");
+					}
+			});
 		}else{
-			dBirth1 = "19"+dBirth1
-		}
-		if(dBirth2.substring(0,1) == "0"){
-			dBirth2 = dBirth2.substring(1,2);
-		}
-		if(dBirth3.substring(0,1) == "0"){
-			dBirth3 = dBirth3.substring(1,2);
-		}
-		
-		$('#dBirth1 option').each(function(){
-			 if (this.value == dBirth1) {
-				 $(this).attr("selected","selected");
-				}
-		});
-		$('#dBirth2 option').each(function(){
-			 if (this.value == dBirth2) {
-				 $(this).attr("selected","selected");
-				}
-		}); 
-		$('#dBirth3 option').each(function(){
-			 if (this.value == dBirth3) {
-				 $(this).attr("selected","selected");
-				}
-		});
+			var dBirth1 = dBirth.substring(0,4);    	
+			var dBirth2 = dBirth.substring(4,6);
+			var dBirth3 = dBirth.substring(6,8);
+			if(dBirth2.substring(0,1) == "0"){
+				dBirth2 = dBirth2.substring(1,2);
+			}
+			if(dBirth3.substring(0,1) == "0"){
+				dBirth3 = dBirth3.substring(1,2);
+			}
+			
+			$('#dBirth1 option').each(function(){
+				 if (this.value == dBirth1) {
+					 $(this).attr("selected","selected");
+					}
+			});
+			$('#dBirth2 option').each(function(){
+				 if (this.value == dBirth2) {
+					 $(this).attr("selected","selected");
+					}
+			}); 
+			$('#dBirth3 option').each(function(){
+				 if (this.value == dBirth3) {
+					 $(this).attr("selected","selected");
+					}
+			});
+		}	
+
 		
 		//위촉년도 selected 처리
 		var apptYr = "${info.apptYr}"
@@ -180,6 +212,53 @@
 	
 	
 	function fncUpdate(){
+    	//핸드폰번호 하이푼 추가
+		 var phoneAll = document.getElementById("phone1").value + "-"+ document.getElementById("phone2").value + "-"+ document.getElementById("phone3").value; 
+  	 	 $("#phone").val(phoneAll)
+		//이메일 합치기
+		var emailAll = document.getElementById("email1").value + "@"+ document.getElementById("email2").value ;
+   	 	$("#email").val(emailAll)
+		//생년월일합치기, 8자리 맞추기
+    	var dBirth1 = $("#dBirth1 option:selected").val()
+    	var dBirth2 = $("#dBirth2 option:selected").val()
+    	var dBirth3 = $("#dBirth3 option:selected").val()
+    	if(dBirth2.length == 1){
+    		dBirth2 = "0"+dBirth2;
+    	}
+    	if(dBirth3.length == 1){
+    		dBirth3 = "0"+dBirth3;
+    	}
+		var dBirthAll = dBirth1 + dBirth2 + dBirth3
+		$("#dBirth").val(dBirthAll)		
+	   	/*
+	   	<!-- for validator #3 -->
+	   	*/
+	   	if (!validateVEInstrDetailVO(document.detailForm)) return;
+	   	/*
+	   	<!-- for validator #3 -->
+	   	*/
+	   	
+	   	/* value에 기본적으로 - 또는 @ 들어가서 필수 값 체크 따로 */
+	    	if($("#phone1").val() == '' || $("#phone2").val() == '' || $("#phone3").val() == ''){
+	   		alert("연락처는 필수입니다.");
+	   		return false;
+	   	}
+	    	if($("#email1").val() == '' || $("#email2").val() == ''){
+	   		alert("이메일은 필수입니다.");
+	   		return false;
+	   	}
+	    	
+	    	/* 청소년 강사와 다른 성인 강사 항목. 공통 validator에 없음 */
+	   	if($("#finalSchol").val() == ''){
+	   		alert("최종학교는 필수입니다.");
+	   		return false;
+	   	}
+	   	
+	   	if($("#mjr").val() == ''){
+	   		alert("전공는 필수입니다.");
+	   		return false;
+	   	}
+		
 		var data = new FormData(document.getElementById("detailForm"));
         if(confirm("수정 하시겠습니까?")){
             $.ajax({
@@ -247,7 +326,7 @@
 	}
 	
 	function fncAreaList(paramObj) {
-		if(paramObj == undefined || paramObj == ''){
+		/* if(paramObj == undefined || paramObj == ''){
 			paramObj = {
 				pageIndex : 1,
 				searchKeyword : "",
@@ -258,9 +337,11 @@
 		}
 		// 학교 리스트 팝업 호출
 		document.detailForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/popup/instrInfo/rsdncPopList.do'/>";
-		window.open("", "_securityPop", "scrollbars = no, top=100px, left=100px, height=538px, width=690px");    
+		window.open('', "_securityPop", "scrollbars = no, top=100px, left=100px, height=538px, width=690px");    
 		document.detailForm.target = "_securityPop";
-		document.detailForm.submit();  
+		document.detailForm.submit();   */
+		
+		commonPopWindowopenForm("${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/popup/instrInfo/rsdncPopList.do", "750", "660", "securityPop", $('#detailForm'));
 	}
 
 </script>
@@ -284,6 +365,10 @@
 	<input type="hidden" name="aprvlCd" id="aprvlCd" value=""/> <!-- 승인코드 -->
 	<input type="hidden" name="aprvlCn" id="aprvlCn" value=""/> <!-- 승인내용(반려사유) -->
 	<input type="hidden" name="rqstType" id="rqstType" value=""/> <!-- 요청유형 -->
+	<input type="hidden" name="phone" id="phone" value=""/> <!-- 연락처 -->
+	<input type="hidden" name="email" id="email" value=""/> <!-- 이메일 -->
+	<input type="hidden" name="dBirth" id="dBirth" value=""/> <!-- 생년월일 -->
+	
 <!-- cont -->
 	<div class="cont_wrap">
 		<div class="box">
@@ -450,7 +535,7 @@
 									<p>구분</p>
 								</th>
 								<td>
-									<ve:select codeId="VE0018" selectedValue="${info.divCd}" styleClass="sel_type1"/>
+									<ve:select codeId="VE0018" name="divCd" id="divCd" selectedValue="${info.divCd}" styleClass="sel_type1"/>
 								</td>
 							</tr>
 							<tr>
@@ -459,7 +544,7 @@
 									<p>위촉구분</p>
 								</th>
 								<td colspan="3">
-									<ve:select codeId="VE0002" selectedValue="${info.apptDiv}" styleClass="sel_type1"/>
+									<ve:select codeId="VE0002" name="apptDiv" id="apptDiv" selectedValue="${info.apptDiv}" styleClass="sel_type1"/>
 								</td>
 							</tr>
 							<tr>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctReg.jsp
index 4552c076..5cb0b52f 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctReg.jsp
@@ -251,11 +251,13 @@ $( document ).ready(function(){
 	
 	function fncRsdnePopup() { //거주지 팝업
 		
-	    document.createForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/popup/instrRsdnePopup.do'/>";
-	    window.open("#", "_rsdnePopup", "scrollbars = no, top=200px, left=2500px, height=500px, width=700px");    
+	    /* document.createForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/popup/instrRsdnePopup.do'/>";
+	    window.open('', "_rsdnePopup", "scrollbars = no, top=200px, left=2500px, height=500px, width=700px");    
 	    document.createForm.target = "_rsdnePopup";
 	    document.createForm.formId.value = "createForm";
-	    document.createForm.submit();  
+	    document.createForm.submit(); */
+	    
+	    commonPopWindowopenForm("${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/popup/instrRsdnePopup.do", "750", "660", "rsdnePopup", $('#createForm'));
 	}	
 	
 	function fncPhotoPopup() {
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctRegExcel.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctRegExcel.jsp
index d8922b71..17cdc462 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctRegExcel.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctRegExcel.jsp
@@ -410,7 +410,7 @@ $( document ).ready(function(){
 		                                        <button type="button" class="btnType btnType9"
 		                                        onclick="document.all.file.click(); return false;"
 		                                        >파일첨부</button>
-		                                        <span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="https://www.copyright.or.kr/offedu/cmm/fms/FileDown.do?atchFileId=FILE_000000000018232&fileSn=0" target="_blank">sample</a></span>
+		                                        <span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001269&fileSn=0" target="_blank">sample</a></span>
 		                                    </td>	
 						</tr>						
 					</tbody>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctStngExcel.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctStngExcel.jsp
index 81f11d43..6e7f1ef1 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctStngExcel.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrAplctStngExcel.jsp
@@ -410,7 +410,7 @@ $( document ).ready(function(){
 		                                        <button type="button" class="btnType btnType9"
 		                                        onclick="document.all.file.click(); return false;"
 		                                        >파일첨부</button>
-		                                        <span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="https://www.copyright.or.kr/offedu/cmm/fms/FileDown.do?atchFileId=FILE_000000000018231&fileSn=0" target="_blank">sample</a></span>
+		                                        <span class="reqTxt6">※ 컴퓨터 파일(엑셀)만 등록 가능합니다.<a href="${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000001268&amp;fileSn=0" target="_blank">sample</a></span>
 		                                    </td>	
 						</tr>						
 					</tbody>