Merge branch 'hylee' into advc

src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/web/EduAplctTngrController.java

@@ -36,6 +36,9 @@ import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO;
 import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiService;
 import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO;
 import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService;
+import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO;
+import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrMixService;
+import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrDetailVO;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsMIXService;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService;
@@ -137,7 +140,11 @@ public class EduAplctTngrController {
 
 	@Resource(name = "vEAStngService")
 	private VEAStngService vEAStngService;
-	
+
+	//rkdtk 관리
+	@Resource(name = "vEInstrMixService")
+	private VEInstrMixService vEInstrMixService;
+
 	
 	/*
 	* START
@@ -633,7 +640,7 @@ public class EduAplctTngrController {
 	 */
 	@RequestMapping("eduInstrAsgnmChkAjax.do")
 	public ModelAndView eduInstrAsgnmChkAjax(
-			@ModelAttribute("vEAStngVO") VEAStngVO vEAStngVO 
+			@ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO 
 			, ModelMap model 
 			, HttpServletRequest request 
 			) throws Exception {
@@ -649,9 +656,8 @@ public class EduAplctTngrController {
 		System.out.println(request.getParameter("userId"));
 		System.out.println(request.getParameter("eduAplctOrd"));
 		System.out.println(request.getParameter("eduChasiOrd"));
-		
+
-		//String s_message =  vEAStngMixService.eduAplctDateChkProcess(vEAStngVO, request, modelAndView);
+    	VELctrDetailVO instrInfo = 	vEInstrMixService.findByIdFromVeInstr(vEInstrDetailVO);
-		
 		//vEAStngMixService.selectDetail_VEADPTQS(paramVO)
 		//ㅁ
 		/*

src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrMixService.java

@@ -92,4 +92,6 @@ public interface VEInstrMixService {
 	
 	//교육실정통계-기반강화
 	List<VELctrDetailVO> selectEduPrfrmInfoFndthEnhanceTrn(VEInstrDetailVO vEInstrDetailVO) throws Exception;
+
+	VELctrDetailVO findByIdFromVeInstr(VEInstrDetailVO vEInstrDetailVO);
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixDAO.java

@@ -208,5 +208,9 @@ public class VEInstrMixDAO extends EgovAbstractDAO {
 		List<VELctrDetailVO> tlist = (List<VELctrDetailVO>) list("VEInstrMixDAO.selectEduPrfrmInfoFndthEnhanceTrn", vEInstrDetailVO);
 		return tlist;
 	}
+
+	public VELctrDetailVO findByIdFromVeInstr(VEInstrDetailVO vEInstrDetailVO) {
+		return (VELctrDetailVO) select("VEInstrMixDAO.findByIdFromVeInstr", vEInstrDetailVO);
+	}
 	
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/impl/VEInstrMixServiceImpl.java

@@ -154,4 +154,9 @@ public class VEInstrMixServiceImpl implements VEInstrMixService {
 	public List<VELctrDetailVO> selectEduPrfrmInfoFndthEnhanceTrn(VEInstrDetailVO vEInstrDetailVO) throws Exception{
 		return vEInstrMixDAO.selectEduPrfrmInfoFndthEnhanceTrn(vEInstrDetailVO);
 	}
+
+	@Override
+	public VELctrDetailVO findByIdFromVeInstr(VEInstrDetailVO vEInstrDetailVO) {
+		return vEInstrMixDAO.findByIdFromVeInstr(vEInstrDetailVO);
+	}
 }

src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml

@@ -3424,4 +3424,24 @@
                  on(bbb.prcs_aplct_prd_ord=aaa.prcsOrd)	
 		GROUP BY rollup(yr, bbb.prcs_nm)				   	
 	</select>		
+	
+	<select id="VEInstrMixDAO.findByIdFromVeInstr" parameterClass="VEInstrDetailVO" resultClass="VELctrDetailVO">
+		select
+			USER_ID              AS userId              
+			, TNGR_INSTR_YN      AS tngrInstrYn      
+			, ADULT_INSTR_YN     AS adultInstrYn     
+			, FRST_REGIST_PNTTM  AS frstRegistPnttm  
+			, FRST_REGISTER_ID   AS frstRegisterId   
+			, LAST_UPDT_PNTTM    AS lastUpdtPnttm    
+			, LAST_UPDUSR_ID     AS lastUpdusrId     
+			, DESC_1             AS desc1             
+			, DESC_2             AS desc2             
+			, DESC_3             AS desc3             
+			, DESC_4             AS desc4             
+		FROM
+			VE_INSTR
+		WHERE 
+			USER_ID = #userId#
+			
+	</select>
 </sqlMap>

src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml

@@ -401,6 +401,7 @@
 		<isNotEmpty property="searchQuery">
 			$searchQuery$
 		</isNotEmpty>
+		ORDER BY qn.FRST_REGIST_PNTTM desc
 		OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
 	</select>
 	

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/popup/changeLctrPopList.jsp

@@ -74,28 +74,21 @@
 			alert("강사ID는 필수 입력값 입니다.");
 			return;
 		}
-		
+		var searchKeyword = $('#searchKeyword').val();
 		$.ajax({
 			type:"POST",
 			url:"${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduAplct/eduInstrAsgnmChkAjax.do",
 			data: {
+				userId : searchKeyword
 			},
 			dataType:'json',
 			async: false,
 			success:function(returnData){
 				if(returnData.result == "fail"){
 					
-					//신청 버튼 숨기기
-					$("div.btn_layout01").hide();
-					//alert("신청가능한 기간이 아닙니다.");					
-					alert("신청가능한 기간이 아닙니다.\n\n"+returnData.message+"\n\n(교사, 학부모 대상 교육은 ‘찾아가는 저작권 교육(성인)'에서 상시 신청 가능합니다)");
-					//location.href="<c:url value='/web/main/mainPage.do'/>"
-					
-					psblFlag = 'N';
 				}else if(returnData.result == "success"){
 								
 					alert("등록처리되었습니다.");
-					//location.href="<c:url value='/web/main/mainPage.do'/>"
 					$(".btn_popup_close").click();
 					
 				}else{