From 7b8228f80f38807f6694398b20939a298e6aa1a7 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Mon, 16 Oct 2023 12:35:10 +0900
Subject: [PATCH] =?UTF-8?q?2023-10-16=2012:34=20=EC=B2=AD=EC=86=8C?=
 =?UTF-8?q?=EB=85=84=20=EA=B0=95=EC=82=AC=20=EB=82=B4=EC=9A=A9=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/utl/fcc/service/EgovCryptoUtil.java   |  2 +-
 .../ve/aplct/comweb/CommonWebController.java  | 10 ++-
 .../tngrVisitEdu/eduAplct/eduAplctDetail.jsp  | 90 +++++++++++++------
 3 files changed, 71 insertions(+), 31 deletions(-)

diff --git a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java
index ab5060c1..7e03b860 100644
--- a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java
+++ b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java
@@ -214,7 +214,7 @@ public class EgovCryptoUtil {
 	public VEEduChasiVO  decryptVEEduChasiVO(VEEduChasiVO p_vEEduChasiVO){
 		
 		if (!"".equals(p_vEEduChasiVO.getInstrNm())) p_vEEduChasiVO.setInstrNm(this.decrypt(p_vEEduChasiVO.getInstrNm()));
-		//if (!"".equals(p_vEEduChasiVO.getPhone())) p_vEEduChasiVO.setPhone(this.decrypt(p_vEEduChasiVO.getPhone()));
+		if (!"".equals(p_vEEduChasiVO.getPhone())) p_vEEduChasiVO.setPhone(this.decrypt(p_vEEduChasiVO.getPhone()));
 		
 		
 		return p_vEEduChasiVO;
diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java
index af81a86c..a7f8eae9 100644
--- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java
+++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java
@@ -214,6 +214,12 @@ public class CommonWebController {
             return modelAndView;
         }
 
+        //로그인 정보 가져오기
+        LoginVO loginVO = checkLoginUtil.getAuthLoginVO();
+        veEduAplctVO.setLastUpdusrId(loginVO.getUniqId());
+        
+        //데이터 암호화
+        veEduAplctVO	=	egovCryptoUtil.encryptVEEduAplctVOInfo(veEduAplctVO);
         int rs = vEEduAplctService.chrgInfoUpdate(veEduAplctVO);
 
         modelAndView.addObject("rsCnt", rs);
@@ -761,12 +767,12 @@ public class CommonWebController {
         
                 
         //step1.전달 파라미터를 대상 쿼리로 변경 하기
-        String s_query	=	"	SELECT '' AS edu_aplct_ord, '' AS edu_chasi_ord	";
+        String s_query	=	"	SELECT '' AS edu_aplct_ord, '' AS edu_chasi_ord	FROM DUAL	";
         String[] s_arr = veEduAplctVO.getEduAplctOrd().split("__");
         for (int i=0;i<s_arr.length;i++) {
         	String[] s_arr_in = s_arr[i].split("@");
         	if (s_arr_in.length==2) {
-        		s_query	=	s_query	+	"	UNION ALL	SELECT '"+s_arr_in[0]+"' AS edu_aplct_ord, '"+s_arr_in[1]+"' AS edu_chasi_ord	";
+        		s_query	=	s_query	+	"	UNION ALL	SELECT '"+s_arr_in[0]+"' AS edu_aplct_ord, '"+s_arr_in[1]+"' AS edu_chasi_ord	FROM	DUAL	";
         	}
         }
         
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp
index 04fb27c9..0d7fd711 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctDetail.jsp
@@ -199,64 +199,98 @@
 <div class="tooltip-wrap">
 	<div class="popup_wrap popType05" tabindex="0" data-tooltip-con="sub37_pop01" data-focus="sub37_pop01" data-focus-prev="sub37_pop01_close">
 		<div class="popup_tit">
-			<p>출력강사 선택</p>
+			<p>강사 연락처</p>
 			<button class="btn_popup_close tooltip-close" data-focus="sub37_pop01_close" title="팝업 닫기"><i></i></button>
 		</div>
 		<div class="popup_cont">
 			<div class="cont_body">
 				<div class="pop_tb_type02">
+<!-- 					<table> -->
+<%-- 						<caption>출력강사 선택 : 선택, 차시, 대상, 강사명 등의 정보제공 </caption> --%>
+<%-- 						<colgroup> --%>
+<%-- 							<col style="width: 5%;"> --%>
+<%-- 							<col style="width: 10%;"> --%>
+<%-- 							<col style="width: 10%;"> --%>
+<%-- 							<col style="width: 10%;"> --%>
+<%-- 						</colgroup> --%>
+<!-- 						<thead> -->
+<!-- 							<tr> -->
+<!-- 								<th scope="col">선택</th> -->
+<!-- 								<th scope="col">차시</th> -->
+<!-- 								<th scope="col">대상</th> -->
+<!-- 								<th scope="col">강사명</th> -->
+<!-- 							</tr> -->
+<!-- 						</thead> -->
+<!-- 						<tbody> -->
+<%-- 						<c:forEach var="list" items="${chasiList}" varStatus="status"> --%>
+<!-- 						<tr> -->
+<!-- 							<th scope="row"> -->
+<%-- 								<c:if test="${! empty list.userId}"> --%>
+<%-- 								<label for="${list.userId}" class="label">강사 선택</label> --%>
+<%-- 								<input type="checkbox" value="${list.userId}" id="${list.userId}" name="printInstrList"> --%>
+<%-- 								</c:if> --%>
+<!-- 							</th> -->
+<!-- 							<td> -->
+<%-- 								<fmt:parseDate value="${list.strtTm}" var="strtTm" pattern="kkmm"/> --%>
+<%-- 								<fmt:formatDate value="${strtTm}" pattern="kk:mm"/> --%>
+<!-- 								~ -->
+<%-- 								<fmt:parseDate value="${list.endTm}" var="endTm" pattern="kkmm"/> --%>
+<%-- 								<fmt:formatDate value="${endTm}" pattern="kk:mm"/> --%>
+<%-- 								(${list.lrnTm}분) --%>
+<!-- 							</td> -->
+<!-- 							<td> -->
+<%-- 								${list.email} --%>
+<%-- 								${list.phone} --%>
+<!-- 							</td> -->
+<!-- 							<td> -->
+<%-- 								${empty list.instrNm ? '-' : list.instrNm} --%>
+<!-- 							</td> -->
+<!-- 						</tr> -->
+<%-- 						</c:forEach> --%>
+<!-- 						</tbody> -->
+<!-- 					</table> -->
 					<table>
-						<caption>출력강사 선택 : 선택, 차시, 대상, 강사명 등의 정보제공 </caption>
-						<colgroup>
-							<col style="width: 5%;">
+						<caption>강사 간략 정보 : 이름, 이메일, 연락처 </caption>
+						<colgroup>							
 							<col style="width: 10%;">
 							<col style="width: 10%;">
 							<col style="width: 10%;">
 						</colgroup>
 						<thead>
 							<tr>
-								<th scope="col">선택</th>
-								<th scope="col">차시</th>
-								<th scope="col">대상</th>
 								<th scope="col">강사명</th>
+								<th scope="col">핸드폰</th>
+								<th scope="col">이메일</th>
 							</tr>
 						</thead>
 						<tbody>
 						<c:forEach var="list" items="${chasiList}" varStatus="status">
 						<tr>
-							<th scope="row">
-								<c:if test="${! empty list.userId}">
-								<label for="${list.userId}" class="label">강사 선택</label>
-								<input type="checkbox" value="${list.userId}" id="${list.userId}" name="printInstrList">
-								</c:if>
-							</th>
-							<td>
-								<fmt:parseDate value="${list.strtTm}" var="strtTm" pattern="kkmm"/>
-								<fmt:formatDate value="${strtTm}" pattern="kk:mm"/>
-								~
-								<fmt:parseDate value="${list.endTm}" var="endTm" pattern="kkmm"/>
-								<fmt:formatDate value="${endTm}" pattern="kk:mm"/>
-								(${list.lrnTm}분)
-							</td>
-							<td>
-								${list.trgt}
-							</td>
 							<td>
 								${empty list.instrNm ? '-' : list.instrNm}
+							</td>						
+							<td>
+								
+								${list.phone}
 							</td>
+							<td>
+								${list.email}
+								
+							</td>
+
 						</tr>
 						</c:forEach>
 						</tbody>
-					</table>
+					</table>					
 				</div>
 				<div class="pop_btn_wrap btn_layout01">
 					<div class="btn_left">
 					</div>
 					<div class="btn_center">
 						
-						<button type="button" class="btnType05" id="popupSubmin" onclick="selectInstr(this);">조회</button>
+<!-- 						<button type="button" class="btnType05" id="popupSubmin" onclick="selectInstr(this);">조회</button> -->
 						
-						<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop01_close" data-focus-next="sub37_pop01">취소</button>
+						<button type="button" class="btnType02 tooltip-close" data-focus="sub37_pop01_close" data-focus-next="sub37_pop01">닫기</button>
 					</div>
 					<div class="btn_right">
 					</div>
@@ -471,7 +505,7 @@
 		<div class="tb_tit01_left">
 			<p>교육신청 내용</p>
 		</div>
-		<c:if test="${info.aprvlCd eq VeConstants.STATUS_CD_SBMT}">
+		<c:if test="${info.aprvlCd eq VeConstants.STATUS_CD_SBMT}"><!-- 10 - 요청 상태 -->
 			<div class="btn_wrap">
 				<button type="button" class="btnType06" data-tooltip="sub01_pop01" title="팝업 열림" onclick="chrgInfoUpdatePop();">담당자 정보 수정</button>
 			</div>