2023-11-15 16:12 성인 찾교 수정

src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/web/EduAplctMngAdultController.java

@@ -233,8 +233,8 @@ public class EduAplctMngAdultController {
     	vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_20);
     	List<VEEduChasiVO> vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO);
     	
-    	vEEduChasiVOList	=	egovCryptoUtil.decryptVEEduChasiVOList(vEEduChasiVOList);
+    	//복호화
-    	
+    	vEEduChasiVOList	=	egovCryptoUtil.decryptVEEduChasiVOList(vEEduChasiVOList);    	
     	
     	model.addAttribute("chasiList", vEEduChasiVOList);
     	

src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java

@@ -245,6 +245,7 @@ public class EduAsgnmCnfrmMngAdultController {
 			
 			
 			//사용자 교육신청 차시 리스트
+			/*
 			VEEduChasiVO vEEduChasiVO = new VEEduChasiVO();
 			vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_20); //성인
 			vEEduChasiVO.setAprvlCd("60"); //교육확정 코드
@@ -252,6 +253,19 @@ public class EduAsgnmCnfrmMngAdultController {
 			vEEduChasiVO.setPageIndex(0);
 			List<VEEduChasiVO> vEEduChasiVOList = vEEduMIXService.selectAdultChasiList(vEEduChasiVO);
 			model.addAttribute("chasiList", vEEduChasiVOList);
+			*/
+			
+	    	//사용자 교육신청 차시 리스트
+	    	VEEduChasiVO vEEduChasiVO = new VEEduChasiVO();
+	    	vEEduChasiVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd());
+	    	vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_20);
+	    	List<VEEduChasiVO> vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO);
+	    	
+	    	//복호화
+	    	vEEduChasiVOList	=	egovCryptoUtil.decryptVEEduChasiVOList(vEEduChasiVOList);    	
+	    	
+	    	model.addAttribute("chasiList", vEEduChasiVOList);			
+			
 			
 			model.addAttribute("cryptoUtil",egovCryptoUtil);
 			

src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml

@@ -3800,16 +3800,25 @@
 		, A.INSTT_DIV_CD                             AS insttDivCd 
 		, A.EDU_SLCT_CD                        AS eduSlctCd 
 		, B.EDU_CHASI_ORD                             AS eduChasiOrd
+		/*
 		, DATE_FORMAT(B.EDU_HOPE_DT,'%Y.%m.%d')       AS eduHopeDt
+		*/
+		, TO_CHAR(B.EDU_HOPE_DT,'YYYY.MM.DD')       AS eduHopeDt
 		, B.STRT_TM                                   AS strtTm
 		, B.END_TM                                    AS endTm
 		, B.LRN_TM                                    AS lrnTm
 		, B.DIV_CD                                    AS divCd
 		, B.TRGT                                      AS trgt
 		, B.PRSNL                                     AS prsnl
+		/*
 		, DATE_FORMAT(B.FRST_REGIST_PNTTM,'%Y-%m-%d') AS frstRegistPnttm
+		*/
+		, TO_CHAR(B.FRST_REGIST_PNTTM,'YYYY-MM-DD') AS frstRegistPnttm
 		, B.FRST_REGISTER_ID                          AS frstRegisterId
+		/*
 		, DATE_FORMAT(B.LAST_UPDT_PNTTM,'%Y-%m-%d')   AS lastUpdtPnttm
+		*/
+		, TO_CHAR(B.LAST_UPDT_PNTTM,'YYYY-MM-DD')   AS lastUpdtPnttm
 		, B.LAST_UPDUSR_ID                            AS lastUpdusrId
 		, B.LRN_SBJCT                                 AS lrnSbjct
 		, B.LRN_CN                                    AS lrnCn

src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctCnfrmMngDetail.jsp

@@ -170,6 +170,20 @@
 							</th>
 							<td colspan="3">${info.email}</td>
 						</tr>
+						<tr>
+							<th scope="row">
+								<p>신청내용</p>
+							</th>
+							<td colspan="3">				
+								<!-- , 들어간 값을 구분해서 표시한다. -->
+								<c:set var="aplctCns" value="${fn:split(info.aplctCn,',')}" />
+								
+								<c:forEach var="aplctCn" items="${aplctCns}" varStatus="g">
+									<ve:code codeId="VEA006" code="${aplctCn}"/>									
+								</c:forEach> 				
+							
+							</td>
+						</tr>							
 						<tr>
 							<th scope="row">
 								<p>희망주제</p>

src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp

@@ -350,6 +350,20 @@
 								${info.email}
 							</td>
 						</tr>
+						<tr>
+							<th scope="row">
+								<p>신청내용</p>
+							</th>
+							<td colspan="3">				
+								<!-- , 들어간 값을 구분해서 표시한다. -->
+								<c:set var="aplctCns" value="${fn:split(info.aplctCn,',')}" />
+								
+								<c:forEach var="aplctCn" items="${aplctCns}" varStatus="g">
+									<kc:code codeId="VEA006" code="${aplctCn}"/>									
+								</c:forEach> 				
+							
+							</td>
+						</tr>							
 						<tr>
 							<th scope="row">
 								<p>희망주제</p>
@@ -375,7 +389,8 @@
 			
 			<!-- 교육차시 정보 list -->
 			<div class="tb_tit01">
-				<p>교육차시 정보</p>(*이동거리는 교육장소부터 강사주소까지의 거리를 TMAP API를 이용하여 계산하였습니다.)
+				<p>교육차시 정보</p>
+<!-- 				(*이동거리는 교육장소부터 강사주소까지의 거리를 TMAP API를 이용하여 계산하였습니다.) -->
 			</div>
 			<div class="tb_type01 list2">
 				<table>
@@ -384,8 +399,8 @@
 						<col style="width: 20%;">
 						<col style="width: auto;">
 						<col style="width: 14%;">
-						<col style="width: 10%;">
+<%-- 						<col style="width: 10%;"> --%>
-						<col style="width: 20%;">
+<%-- 						<col style="width: 20%;"> --%>
 					</colgroup>
 					<thead>
 						<tr>
@@ -394,8 +409,8 @@
 							<th scope="col">대상</th>
 							<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>
@@ -433,6 +448,7 @@
 								<td>
 									<c:out value="${list.prsnl}" />
 								</td>
+								<!-- 
 								<td>
 									<c:choose>
 										<c:when test="${list.onewayDstnc eq null or info.eduSlctCd eq '10'}">
@@ -452,6 +468,7 @@
 										-
 									</c:if>
 								</td>
+								 -->
 							</tr>
 						</c:forEach>						
 					</tbody>

src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp

@@ -666,7 +666,7 @@
 	                        	
 		                    </c:if>
 		                     -->
-		                    <!-- 요청 중 또는 취소가 아니고 다른 요청 항목이 없을 시 수정 요청 가능 -->
+		                    <!-- 요청 중 또는 취소가 아니고 다른 요청 항목이 없을 시 수정 요청 가능 -->		                    
 		                    <c:if test="${info.aprvlCd ne '10' and info.aprvlCd ne '40' and empty vEInstrMdfyRqstList}">
 		                   	 	<button class="btnType06 btn_list" onclick="fncMdfy(); return false;">정보 수정 </button>
 		                    </c:if>