From b4c9d691e82ecb1d0a0e39e719dbd981a7c6de9e Mon Sep 17 00:00:00 2001
From: wyh <mail>
Date: Fri, 3 Nov 2023 16:35:11 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=95=EC=9D=98=ED=9D=AC=EB=A7=9D=20?=
 =?UTF-8?q?=EA=B5=90=EC=9C=A1=EB=B6=84=EC=95=BC=20=EB=85=B8=EC=B6=9C=20?=
 =?UTF-8?q?=EB=B0=8F=20=20=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ve/instr/VEInstrDetail_SQL_Tibero.xml     |  4 +
 .../ve/instr/VEInstr_MIX_SQL_Tibero.xml       |  4 +-
 .../oprtn/adultVisitEdu/instrMngDetail.jsp    | 75 ++++++++++++++-----
 .../popup/instrMdfyRqstPopup.jsp              | 37 +++++++++
 .../instrInfo/instrPrflDetail.jsp             | 20 ++++-
 5 files changed, 117 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml
index c3d303e7..c4090802 100644
--- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstrDetail_SQL_Tibero.xml
@@ -418,9 +418,13 @@
 			hchk_dt	= #hchkDt#,
 		</isNotEmpty><isNotEmpty property="rmrks">
 			rmrks	= #rmrks#,	
+		</isNotEmpty><isNotEmpty property="hopeEduFld">
+			hope_edu_fld	= #hopeEduFld#,
 		</isNotEmpty>
 		
 		
+		
+		
 		<!-- 요청 시 기존 반려 사유 삭제 -->
 		<isEqual property="aprvlCd" compareValue="10">
 			aprvl_cn	= '',
diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml
index 655fe772..e5c0908e 100644
--- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml
@@ -128,8 +128,8 @@
        		a.qlfct_end_yn		AS qlfctEndYn,
        		a.qlfct_end_pnttm	AS qlfctEndPnttm,
        		a.qlfct_end_cn		AS qlfctEndCn,
-       		a.div_cd			AS divCd
-       		    	   	
+       		a.div_cd			AS divCd,
+       		a.hope_edu_fld		AS hopeEduFld
 	</sql>
 		
 	<!-- 강사 정보 R -->
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp
index 33285f8b..0084ff40 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/instrMngDetail.jsp
@@ -27,7 +27,7 @@
 $( document ).ready(function(){
 	//배정차시계산
 	//asgnmOnchange();
-
+	
 	//SSO 핸드폰 번호 넣어주기
 	var phoneAll = "${info.phone}"
 	var phoneReplace = phoneAll.replace(/(^02.{0}|^01.{1}|[0-9]{3})([0-9]+)([0-9]{4})/,"$1-$2-$3");
@@ -405,6 +405,25 @@ function getYears(getYear){
 							</th>
 							<td colspan="3"><c:out value='${info.prfsnFld}' /></td>
 						</tr>
+						<tr>
+							<th scope="row">
+								<p>강의희망 교육분야</p>
+							</th>
+							<td colspan="3">
+								<label for="mnLctrCn" class="label">강의희망 교육분야</label>
+								<ve:checkbox name="hopeEduFldView" id="hopeEduFldView" codeId="VEA006" includes="01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20"/>
+								<!-- , 들어간 값을 구분해서 표시한다. -->
+								<c:set var="hopeEduFldView" value="${fn:split(info.hopeEduFld,',')}" />
+								
+								<c:forEach var="hopeEduFld" items="${hopeEduFldView}" varStatus="g">						
+									<script>
+									$("input[name=hopeEduFldView][value=${hopeEduFld}]").prop("checked",true);
+									$("input[name=hopeEduFldView][value=${hopeEduFld}]").prop("disabled","disabled");
+									</script>
+								</c:forEach> 
+							</td>
+						</tr>
+						
 						<%-- <tr>
 							<th scope="row">
 								<p>주요강의내용</p>
@@ -603,28 +622,44 @@ function getYears(getYear){
 								<ve:select codeId="VE0018" name="divCd" id="divCd" css="class='sel_type1'" selectedValue="${info.divCd}" />							
 							</td>
 						</tr>
-						
-							<tr>
-								<th scope="row">
-									<p>위촉구분${info.apptDiv}</p>
-								</th>
-								<td colspan="3">		
-								<ve:code codeId="VE0032" code="${info.apptDiv}"/>							
-									<ve:select codeId="VE0032" name="apptDiv" id="apptDiv" css="class='sel_type1'"  selectedValue="${info.apptDiv}"/>
-								</td>
-							</tr>							
-						
 						<tr>
-								<th scope="row">
-									<p class="req_text"><span>필수입력 항목</span>*</p>
-									<p>전문분야</p>
-								</th>
-								<td colspan="3">
-									<label for="mnLctrCn" class="label">주요강의내용</label>
-									<textarea name="prfsnFld" id="prfsnFld" placeholder="ex)예문
+							<th scope="row">
+								<p>위촉구분${info.apptDiv}</p>
+							</th>
+							<td colspan="3">		
+							<ve:code codeId="VE0032" code="${info.apptDiv}"/>							
+								<ve:select codeId="VE0032" name="apptDiv" id="apptDiv" css="class='sel_type1'"  selectedValue="${info.apptDiv}"/>
+							</td>
+						</tr>
+						<tr>
+							<th scope="row">
+								<p class="req_text"><span>필수입력 항목</span>*</p>
+								<p>전문분야</p>
+							</th>
+							<td colspan="3">
+								<label for="mnLctrCn" class="label">주요강의내용</label>
+								<textarea name="prfsnFld" id="prfsnFld" placeholder="ex)예문
 - SW코딩, 사물인터넷,인공지능,인성, 비젼, 캠프, 인터넷중독, 가족치료, 저작권 개론 등"><c:out value='${info.prfsnFld}'/></textarea>
 							</td>
-						</tr>							
+						</tr>
+						<tr>
+							<th scope="row">
+								<p class="req_text"><span>필수입력 항목</span>*</p>
+								<p>강의희망 교육분야</p>
+							</th>
+							<td colspan="3">
+								<label for="mnLctrCn" class="label">강의희망 교육분야</label>
+								<ve:checkbox name="hopeEduFld" id="hopeEduFld" codeId="VEA006" includes="01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20"/>
+								<!-- , 들어간 값을 구분해서 표시한다. -->
+								<c:set var="hopeEduFld" value="${fn:split(info.hopeEduFld,',')}" />
+								
+								<c:forEach var="hopeEduFld" items="${hopeEduFld}" varStatus="g">						
+									<script>
+									$("input[name=hopeEduFld][value=${hopeEduFld}]").prop("checked",true);
+									</script>
+								</c:forEach> 
+							</td>
+						</tr>
 						<!-- <tr>
 							<th scope="row">
 								<p>위촉구분</p>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrMdfyRqstPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrMdfyRqstPopup.jsp
index b6eea7d2..2c92f23e 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrMdfyRqstPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/instrMdfyRqstPopup.jsp
@@ -227,6 +227,25 @@
 						</th>
 						<td colspan="3"><c:out value='${info_ori.prfsnFld}' /></td>
 					</tr>
+					<tr>
+						<th scope="row">
+							<p>강의희망 교육분야</p>
+						</th>
+						<td colspan="3">
+							<label for="mnLctrCn" class="label">강의희망 교육분야</label>
+							<ve:checkbox name="hopeEduFld_ori" id="hopeEduFld_ori" codeId="VEA006" includes="01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20"/>
+							<!-- , 들어간 값을 구분해서 표시한다. -->
+							<c:set var="hopeEduFld_ori" value="${fn:split(info_ori.hopeEduFld,',')}" />
+							
+							<c:forEach var="hopeEduFld_ori" items="${hopeEduFld_ori}" varStatus="g">						
+								<script>
+								$("input[name=hopeEduFld_ori][value=${hopeEduFld_ori}]").prop("checked",true);
+								$("input[name=hopeEduFld_ori][value=${hopeEduFld_ori}]").prop("disabled","disabled");
+								</script>
+							</c:forEach> 
+						</td>
+					</tr>
+					
 					<%-- <tr>
 						<th scope="row">
 							<p>주요강의내용</p>
@@ -342,6 +361,24 @@
 						</th>
 						<td colspan="3"><c:out value='${info.prfsnFld}' /></td>
 					</tr>
+					<tr>
+						<th scope="row">
+							<p>전문분야</p>
+						</th>
+						<td colspan="3">
+							<label for="mnLctrCn" class="label">강의희망 교육분야</label>
+							<ve:checkbox name="hopeEduFld" id="hopeEduFld" codeId="VEA006" includes="01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20"/>
+							<!-- , 들어간 값을 구분해서 표시한다. -->
+							<c:set var="hopeEduFld" value="${fn:split(info.hopeEduFld,',')}" />
+							
+							<c:forEach var="hopeEduFld" items="${hopeEduFld}" varStatus="g">						
+								<script>
+								$("input[name=hopeEduFld][value=${hopeEduFld}]").prop("checked",true);
+								$("input[name=hopeEduFld][value=${hopeEduFld}]").prop("disabled","disabled");
+								</script>
+							</c:forEach> 
+						</td>
+					</tr>
 					<%-- <tr>
 						<th scope="row">
 							<p>주요강의내용</p>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp
index 05db9757..84965458 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp
@@ -353,7 +353,25 @@
 								<td colspan="3">
 									<p><c:out value="${info.prfsnFld}"/></p>
 								</td>
-							</tr>		
+							</tr>
+							<tr>
+								<th scope="row">
+									<p class="req_text"><span>필수입력 항목</span>*</p>
+									<p>강의희망 교육분야</p>
+								</th>
+								<td colspan="3">
+									<ve:checkbox name="hopeEduFld" id="hopeEduFld" codeId="VEA006" includes="01,02,03,04,05,06,07,08,09,10,11,12,13,14,15,16,17,18,19,20"/>
+									<!-- , 들어간 값을 구분해서 표시한다. -->
+									<c:set var="hopeEduFld" value="${fn:split(info.hopeEduFld,',')}" />
+									
+									<c:forEach var="hopeEduFld" items="${hopeEduFld}" varStatus="g">						
+										<script>
+											$("input[name=hopeEduFld][value=${hopeEduFld}]").prop("checked",true);
+											$("input[name=hopeEduFld][value=${hopeEduFld}]").prop("disabled","disabled");
+										</script>
+									</c:forEach>
+								</td>
+							</tr>
 	                    </tbody>
 	                </table>
 				</div>