2023-10-11 18:23 청소년 수정 사항 반영

src/main/java/kcc/com/utl/fcc/service/EgovStringUtil.java

@@ -901,4 +901,22 @@ public class EgovStringUtil {
 			return "";
 		}
 	}
+	
+	/**
+	 * <p>날짜 형식의 문자열 내부에 마이너스 character(-)를 추가한다.</p>
+	 *
+	 * <pre>
+	 *   StringUtil.addDotChar("20100901") = "2010.09.01"
+	 * </pre>
+	 *
+	 * @param date  입력받는 문자열
+	 * @return " - "가 추가된 입력문자열
+	 */
+	public static String addDotChar(String date) {
+		if (date.length() == 8) {
+			return date.substring(0, 4).concat(".").concat(date.substring(4, 6)).concat(".").concat(date.substring(6, 8));
+		} else {
+			return "";
+		}
+	}	
 }

src/main/java/kcc/ve/adv/tngr/stngInfo/service/VEAStngMixService.java

@@ -2,6 +2,10 @@ package kcc.ve.adv.tngr.stngInfo.service;
 
 import java.util.List;
 
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.web.servlet.ModelAndView;
+
 public interface VEAStngMixService {
 	
 	//VEA_LCTR_YR_STNG	-	강의년도설정
@@ -24,5 +28,15 @@ public interface VEAStngMixService {
 	
 	//VEA_AREA_LCTR_STNG	-	지역별 강의 가능 시간 정보
 	//강의가능기간 일정 데이터	-	강의가능기간 세부 선택 데이터
-	List<VEAStngVO> 	selectList_VEAALS_1(VEAStngVO paramVO) throws Exception;				//	LIST	
+	List<VEAStngVO> 	selectList_VEAALS_1(VEAStngVO paramVO) throws Exception;				//	LIST
+	
+	//vea_lctr_rnds_stng	-	강의회차설정
+	String eduAplctDateChkProcess(VEAStngVO paramVO , HttpServletRequest request, ModelAndView modelAndView) throws Exception;
+	
+	//vea_lctr_psbl_prd_stng	-	해당 회차의 신청 가능한 기간일지 체크
+	boolean eduAplctChkDate(VEAStngVO vEAStngVO , HttpServletRequest request) throws Exception;
+	
+	//vea_lctr_rnds_stng	-	해당 회차의 신청 가능한 시간인지 체크
+	//vea_area_lctr_stng	
+	boolean eduAplctChkTime(VEAStngVO vEAStngVO , HttpServletRequest request) throws Exception;	
 }

src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixDAO.java

@@ -44,4 +44,25 @@ public class VEAStngMixDAO extends EgovAbstractDAO {
 		return tlist;
 	}
 	
+	//L
+	public List<VEAStngVO> selectDateChkList(VEAStngVO paramVO) throws Exception {
+		List<VEAStngVO> tlist = (List<VEAStngVO>) list("VEALctrYrStngMixDAO.selectDateChkList", paramVO);
+		return tlist;
+	}
+	
+	public List<VEAStngVO> selectNextDateList(VEAStngVO paramVO) throws Exception {
+		List<VEAStngVO> tlist = (List<VEAStngVO>) list("VEALctrYrStngMixDAO.selectNextDateList", paramVO);
+		return tlist;
+	}
+	
+	//L
+	public VEAStngVO selectEduAplctDateChkList(VEAStngVO paramVO) throws Exception {
+		VEAStngVO tlist = (VEAStngVO) list("VEALctrYrStngMixDAO.selectEduAplctDateChkList", paramVO);
+		return tlist;
+	}
+
+	public VEAStngVO selectEduAplctTimeChkList(VEAStngVO paramVO) throws Exception {
+		VEAStngVO tlist = (VEAStngVO) list("VEALctrYrStngMixDAO.selectEduAplctTimeChkList", paramVO);
+		return tlist;
+	}
 }

src/main/java/kcc/ve/adv/tngr/stngInfo/service/impl/VEAStngMixServiceImpl.java

@@ -4,8 +4,10 @@ package kcc.ve.adv.tngr.stngInfo.service.impl;
 import java.util.List;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 
 import org.springframework.stereotype.Service;
+import org.springframework.web.servlet.ModelAndView;
 
 import kcc.ve.adv.tngr.stngInfo.service.VEAStngMixService;
 import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO;
@@ -56,5 +58,167 @@ public class VEAStngMixServiceImpl implements VEAStngMixService {
 
 	public List<VEAStngVO> selectList_VEAALS_1(VEAStngVO paramVO) throws Exception{
 		return vEAStngMixDAO.selectList_VEAALS_1(paramVO);
-	}	
+	}
+	
+    @Override
+    public String eduAplctDateChkProcess(VEAStngVO vEAStngVO, HttpServletRequest request, ModelAndView modelAndView) throws Exception {
+
+        //VELctrDetailVO vELctrDetailVO = new VELctrDetailVO();
+        //boolean flag = true;
+        String s_ret	=	"";
+        
+        //현재 일시로 등록 가능한 강의 지역이 있는지 확인
+        //List<VELctrDetailVO> list = vELctrAreaMngDAO.selectDateChkList(vELctrDetailVO);
+        List<VEAStngVO> list = vEAStngMixDAO.selectDateChkList(vEAStngVO);
+        
+        
+        
+        //위 날짜와 시간에 부합하는 데이터가 없는 경우 flag 변경 처리
+        if(list.size() <= 0) {
+        	
+        	list = vEAStngMixDAO.selectNextDateList(vEAStngVO);
+        	
+        	if (list.size() != 0) {
+        		try {
+        			String s_start	=	list.get(0).getRgstrStrtPnttm().substring(0, 10) + " " + list.get(0).getRgstrStrtPnttm().substring(10, 12);
+        			String s_ddln	=	list.get(0).getRgstrDdlnPnttm().substring(0, 10) + " " + list.get(0).getRgstrDdlnPnttm().substring(10, 12);
+        			
+        			s_ret	=	"다음 등록기간은 아래와 같습니다.\n"+s_start+"시 ~ "+s_ddln+"시 ";	
+        		}catch(Exception ex) {
+        			ex.printStackTrace();
+        			s_ret	=	"현재 다음 등록기간 정보가 없습니다.";
+        		}
+        		
+        	}else {
+        		s_ret	=	"현재 다음 등록기간 정보가 없습니다.";	
+        	}
+        	
+        	//s_ret	=	"다음 등록기간은 아래와 같습니다.\n2022.03.02 9시 ~ 2022.03.11 24시 ";        	
+        	//flag = false;
+        }else {
+        	s_ret	=	list.get(0).getRndsOrd();
+        }
+        
+        return s_ret;
+    }
+    
+    @Override
+    public boolean eduAplctChkDate(VEAStngVO vEAStngVO, HttpServletRequest request) throws Exception {        
+        boolean flag = true;
+        
+        
+        //교육 희망일자별로 가능한 일자인지 확인 한다.
+        System.out.println("vEAStngVO.toString()1");
+        String[] s_eduHopeDt	=	request.getParameterValues("eduHopeDt");
+        System.out.println("vEAStngVO.toString()2");
+                
+        
+		for (int i=0; i<s_eduHopeDt.length; i++) {
+			if(flag == false) break;
+			vEAStngVO.setLctrPsblStrtDt(s_eduHopeDt[i]);
+        	
+        	//vELctrDetailVO.setPrdDivCd(prdDivCd[i]);
+			System.out.println("vEAStngVO.toString()");
+			System.out.println(vEAStngVO.toString());
+			System.out.println(vEAStngVO.toString());
+        	
+        	//청소년 요청이 신청한 지역의 신청 제한에 맞게 재대로 신청한 것인지 확인 한다.
+            VEAStngVO dateVO = vEAStngMixDAO.selectEduAplctDateChkList(vEAStngVO);
+            
+            System.out.println("vEAStngVO.toString()3");
+            
+            //위 날짜에 부합하는 데이터가 없는 경우 flag 변경 처리
+            //가능한 기간에 값이 있고, 불가능한 기간에 값이 없음
+            if (Integer.parseInt(dateVO.getDpStrtDt())>0 && Integer.parseInt(dateVO.getDpDdlnDt())<=0){
+            	;
+            }else {
+            	flag = false;
+            }
+        }  
+		
+        return flag;
+    }
+    
+    @Override
+    public boolean eduAplctChkTime(VEAStngVO vEAStngVO, HttpServletRequest request) throws Exception {
+
+        //로그인 처리====================================
+        
+        boolean flag = true;
+        
+        /*
+        
+        String eduSlctCd = request.getParameter("eduSlctCd");
+        
+        //차시 저장
+        String[] s_strtTm	=	request.getParameterValues("strtTm");
+        String[] s_endTm	=	request.getParameterValues("endTm");
+        String[] eduSlctAreaCd = request.getParameterValues("eduSlctAreaCd");
+        
+        VELctrDetailVO vELctrDetailVO = new VELctrDetailVO();
+        
+        
+		for (int i=0; i<s_strtTm.length; i++) {
+			if(flag == false) break;
+        	vELctrDetailVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+        	vELctrDetailVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
+        	vELctrDetailVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
+        	vELctrDetailVO.setSearchAplctChk("Y");	//해당 프로세스 검색여부
+        	vELctrDetailVO.setInstrDiv("10");		//청소년
+        	
+            if ("10".equals(eduSlctCd)) {	//온라인인 경우
+            	vELctrDetailVO.setAreaCd("400");
+            }else {	//오프라인인 경우
+            	vELctrDetailVO.setAreaCd(eduSlctAreaCd[i]);
+            }        	
+        	
+        	//vELctrDetailVO.setPrdDivCd(prdDivCd[i]);
+        	
+        	//청소년 요청이 신청한 지역의 신청 제한에 맞게 재대로 신청한 것인지 확인 한다.
+            List<VELctrDetailVO> list = vELctrAreaMngDAO.selectList(vELctrDetailVO);
+            
+            //위 날짜와 시간에 부합하는 데이터가 없는 경우 flag 변경 처리
+            if(list.size() == 0) {
+            	flag = false;
+            }
+            
+        }  
+		
+		
+        
+        //차시 저장
+        String[] s_eduHopeDt	=	request.getParameterValues("eduHopeDt");
+        
+        VELctrDetailVO vELctrDetailVO = new VELctrDetailVO();
+        
+        
+		for (int i=0; i<s_eduHopeDt.length; i++) {
+			if(flag == false) break;
+        	vELctrDetailVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+        	vELctrDetailVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
+        	vELctrDetailVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
+        	vELctrDetailVO.setSearchAplctChk("Y");	//해당 프로세스 검색여부
+        	vELctrDetailVO.setInstrDiv("10");		//청소년
+        	
+            if ("10".equals(eduSlctCd)) {	//온라인인 경우
+            	vELctrDetailVO.setAreaCd("400");
+            }else {	//오프라인인 경우
+            	vELctrDetailVO.setAreaCd(eduSlctAreaCd[i]);
+            }        	
+        	
+        	//vELctrDetailVO.setPrdDivCd(prdDivCd[i]);
+        	
+        	//청소년 요청이 신청한 지역의 신청 제한에 맞게 재대로 신청한 것인지 확인 한다.
+            List<VEAStngVO> list = vEAStngMixDAO.selectEduAplctDateChkList(vELctrDetailVO);
+            
+            //위 날짜와 시간에 부합하는 데이터가 없는 경우 flag 변경 처리
+            if(list.size() == 0) {
+            	flag = false;
+            }
+            
+        }  
+		*/
+		
+        return flag;
+    }    
 }

src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java

@@ -1,5 +1,14 @@
 package kcc.ve.aplct.adultVisitEdu.eduAplct.service.impl;
 
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
 import egovframework.rte.fdl.idgnr.EgovIdGnrService;
 import kcc.com.cmm.LoginVO;
 import kcc.com.cmm.service.EgovFileMngService;
@@ -8,20 +17,16 @@ import kcc.com.utl.user.service.CheckFileUtil;
 import kcc.com.utl.user.service.CheckLoginUtil;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 import kcc.ve.aplct.adultVisitEdu.eduAplct.service.EduAplctAdultService;
-import kcc.ve.aplct.tngrVisitEdu.eduAplct.service.EduAplctTngrService;
 import kcc.ve.cmm.VeConstants;
-import kcc.ve.instr.tngrVisitEdu.eduInfo.service.*;
+import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctOnlnService;
-import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsCntntVO;
+import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService;
+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.prcsInfo.service.VEPrcsMIXService;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
 
 @Service("eduAplctAdultService")
 public class EduAplctAdultServiceImpl implements EduAplctAdultService {
@@ -137,7 +142,8 @@ public class EduAplctAdultServiceImpl implements EduAplctAdultService {
         for (int i=0;i<s_eduHopeDt.length;i++) {
             String eduChasiOrd = eduChasiGnrService.getNextStringId(); // 교육차시 순번
             vEEduChasiVO.setEduChasiOrd(eduChasiOrd);
-            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            //vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i]);
             vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setLrnTm(s_lrnTm[i]);
@@ -216,7 +222,8 @@ public class EduAplctAdultServiceImpl implements EduAplctAdultService {
         for (int i=0;i<s_eduHopeDt.length;i++) {
             String eduChasiOrd = eduChasiGnrService.getNextStringId(); // 교육차시 순번
             vEEduChasiVO.setEduChasiOrd(eduChasiOrd);
-            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            //vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i]);
             vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setLrnTm(s_lrnTm[i]);

src/main/java/kcc/ve/aplct/comweb/CommonWebController.java

@@ -15,6 +15,7 @@ import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
 import kcc.com.cmm.LoginVO;
 import kcc.com.cmm.service.EgovFileMngService;
 import kcc.com.cmm.service.FileVO;
+import kcc.com.utl.fcc.service.EgovStringUtil;
 import kcc.com.utl.user.service.CheckLoginUtil;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 import kcc.ve.cmm.VeConstants;
@@ -84,7 +85,7 @@ public class CommonWebController {
         PaginationInfo paginationInfo = this.setPagingStep1(vEEduAplctVO);
 
         vEEduAplctVO = this.setPagingStep2(vEEduAplctVO, paginationInfo);
-        List<VEEduAplctVO> vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO);
+        List<VEEduAplctVO> vEEduAplctVOList = vEEduMIXService.selectPagingList4Temp(vEEduAplctVO);
         vEEduAplctVOList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduAplctVOList);
 
         paginationInfo = this.setPagingStep3(vEEduAplctVOList, paginationInfo);
@@ -248,6 +249,14 @@ public class CommonWebController {
         vEEduChasiVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd());
         List<VEEduChasiVO> vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO);
 
+        for(int i=0;i<vEEduChasiVOList.size();i++) {
+        	VEEduChasiVO vEEduChasiVOT	=	vEEduChasiVOList.get(i);
+        	
+        	if (vEEduChasiVOT.getEduHopeDt().length()==8) {
+        		vEEduChasiVOT.setEduHopeDt(EgovStringUtil.addDotChar(vEEduChasiVOT.getEduHopeDt()));        		
+        	}
+        }
+        
         //파일 정보 가져오기
         FileVO fileVO = new FileVO();
 //        fileVO.setAtchFileId(vEEduAplctVO.getScholSealAtchFileId());

src/main/java/kcc/ve/aplct/tngrVisitEdu/eduAplct/service/impl/EduAplctTngrServiceImpl.java

@@ -115,6 +115,8 @@ public class EduAplctTngrServiceImpl implements EduAplctTngrService {
 
         if ("ERROR".equals(s_scholSealAtchFileId)) return false;
         //step2.파일 처리====================================
+        
+        
         //교육신청 번호 생성 및 디비 저장하기
         String eduAplctOrd = eduAplctGnrService.getNextStringId(); // 고유ID
         vEEduAplctVO.setEduAplctOrd(eduAplctOrd);
@@ -148,6 +150,10 @@ public class EduAplctTngrServiceImpl implements EduAplctTngrService {
         String[] s_trgt	=	request.getParameterValues("trgt");
         String[] s_prsnl	=	request.getParameterValues("prsnl");
 
+        System.out.println("s_divCd.length");
+        System.out.println(s_divCd.length);
+        System.out.println(s_trgt.length);
+        
         VEEduChasiVO vEEduChasiVO	=	new VEEduChasiVO();
         vEEduChasiVO.setEduAplctOrd(eduAplctOrd);				//교육신청순번
         vEEduChasiVO.setFrstRegisterId(loginVO.getUniqId());	//esntl_id
@@ -156,7 +162,8 @@ public class EduAplctTngrServiceImpl implements EduAplctTngrService {
         for (int i=0;i<s_eduHopeDt.length;i++) {
             String eduChasiOrd = eduChasiGnrService.getNextStringId(); // 교육차시 순번
             vEEduChasiVO.setEduChasiOrd(eduChasiOrd);
-            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            //vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i]);
             vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setLrnTm(s_lrnTm[i]);
@@ -249,7 +256,8 @@ public class EduAplctTngrServiceImpl implements EduAplctTngrService {
         for (int i=0;i<s_eduHopeDt.length;i++) {
             String eduChasiOrd = eduChasiGnrService.getNextStringId(); // 교육차시 순번
             vEEduChasiVO.setEduChasiOrd(eduChasiOrd);
-            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            //vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i]);
             vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setLrnTm(s_lrnTm[i]);
@@ -345,7 +353,8 @@ public class EduAplctTngrServiceImpl implements EduAplctTngrService {
         for (int i=0;i<s_eduHopeDt.length;i++) {
             String eduChasiOrd = eduChasiGnrService.getNextStringId(); // 교육차시 순번
             vEEduChasiVO.setEduChasiOrd(eduChasiOrd);
-            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            //vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i]);
             vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setLrnTm(s_lrnTm[i]);

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

@@ -23,6 +23,8 @@ import kcc.com.utl.user.service.CheckFileUtil;
 import kcc.com.utl.user.service.CheckLoginUtil;
 import kcc.let.uat.uia.service.SsoLoginVO;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
+import kcc.ve.adv.tngr.stngInfo.service.VEAStngMixService;
+import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO;
 import kcc.ve.aplct.tngrVisitEdu.eduAplct.service.EduAplctTngrService;
 import kcc.ve.cmm.VeConstants;
 import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctOnlnService;
@@ -125,6 +127,9 @@ public class EduAplctTngrController {
 	@Resource(name = "eduAplctTngrService")
 	private EduAplctTngrService eduAplctTngrService;
 	
+	//강의설정 관리(MIX)
+	@Resource(name = "vEAStngMixService")
+	private VEAStngMixService vEAStngMixService;
 
 	/*
 	* START
@@ -262,9 +267,39 @@ public class EduAplctTngrController {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.setViewName("jsonView");
 
+		/*
+		 * //0.로그인 실패-fail4
+		 * 	//1.교육희망일이 신청 가능한 일자인지 fail3
+			//2.신청 시간이 해당 지역의 가능한 시간인지 fail
+			//3.중복시간 체크 - fail2
+		 * */
 		//로그인 처리====================================
-		//로그인 정보 가져오기
+		//0.로그인 실패-fail4
+        LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+        SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request);	//SSO 로그인 정보 가져오기
+        
+        if (loginVO == null || ssoLoginVO == null) {
+        	//이전 url 처리(beforeSiteUrl)_이준호_220228추가
+			modelAndView.addObject("result", "fail4");
+			return modelAndView;
+//        	return checkLoginUtil.getUserLoginPage(model);	//로그인 정보가 없으면 로그인 페이지로 이동한다.
+        }	
+        
+        //1.교육희망일이 신청 가능한 일자인지 fail3
+        VEAStngVO vEAStngVO	=	new VEAStngVO();
+        vEAStngVO.setFrstRegisterId(loginVO.getUniqId());
+        vEAStngVO.setRndsOrd(request.getParameter("rndsOrd"));
+        System.out.println(vEAStngVO.toString());
+        boolean flag3 =  vEAStngMixService.eduAplctChkDate(vEAStngVO, request);
+        
+        if(!flag3){
+			modelAndView.addObject("result", "fail3");
+			return modelAndView;
+		}
+        
+        //2.신청 시간이 해당 지역의 가능한 시간인지 fail
 		//신청한 교육 일자 및 시간이 신청기간에 받을수 있는 지역의 시간, 일자 조건에 맞는지 확인 한다.
+        //boolean flag =  vEAStngMixService.eduAplctChkTime(vEAStngVO, request);
 		boolean flag =  eduAplctTngrService.eduAplctChkProcess(vEEduAplctVO, request, modelAndView);
 
 		if(!flag){
@@ -289,22 +324,33 @@ public class EduAplctTngrController {
 	 * // 신청기간에 정상적으로 들어온 것인지 체크하는 로직
 	 */
 	@RequestMapping("eduAplctDateChkAjax.do")
-	public ModelAndView eduAplctDateChkAjax(@ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model , HttpServletRequest request ) throws Exception {
+	public ModelAndView eduAplctDateChkAjax(
+			@ModelAttribute("vEAStngVO") VEAStngVO vEAStngVO 
+			, ModelMap model 
+			, HttpServletRequest request 
+			) throws Exception {
 		ModelAndView modelAndView = new ModelAndView();
 		modelAndView.setViewName("jsonView");
 
 		//로그인 처리====================================
 		//일자 정보 가져오기
 		//boolean flag =  eduAplctTngrService.eduAplctDateChkProcess(vEEduAplctVO, request, modelAndView);
-		String s_message =  eduAplctTngrService.eduAplctDateChkProcess(vEEduAplctVO, request, modelAndView);
+		//String s_message =  eduAplctTngrService.eduAplctDateChkProcess(vEEduAplctVO, request, modelAndView);
 
-		if(!"".equals(s_message)){
+		String s_message =  vEAStngMixService.eduAplctDateChkProcess(vEAStngVO, request, modelAndView);
+		
+		//vEAStngMixService.selectDetail_VEADPTQS(paramVO)
+		//ㅁ
+		
+
+		if(!"".equals(s_message) && s_message.indexOf("rndsOrd")<0){
 		//if(!flag){
 			modelAndView.addObject("result", "fail");			
 			modelAndView.addObject("message", s_message);
 			return modelAndView;
 		}		
 		modelAndView.addObject("result", "success");
+		modelAndView.addObject("rndsOrd", s_message);
 		
 		return modelAndView;
 	}
@@ -364,7 +410,7 @@ public class EduAplctTngrController {
 
 
 		vEEduAplctVO.setMode(VeConstants.MODE_UPT);
-    	
+		System.out.println("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++4");
     	//기본데이터 불러오기
     	vEEduAplctVO	=	vEEduAplctService.selectDetail(vEEduAplctVO);
     	
@@ -380,6 +426,7 @@ public class EduAplctTngrController {
 		vEPrcsDetailVO.setUseYn("Y");
 		vEPrcsDetailVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_10);
     	//List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsMIXService.selectMberEduAplctPrcsList(vEPrcsDetailVO);
+		System.out.println("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++3");
 		List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsService.selectTngrPrcsList(vEPrcsDetailVO);
     	
     	model.addAttribute("list", vEPrcsDetailVOList);
@@ -388,12 +435,12 @@ public class EduAplctTngrController {
     	//사용자 교육신청 차시 리스트
     	VEEduChasiVO vEEduChasiVO = new VEEduChasiVO();
     	vEEduChasiVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd());
-    	
+    	System.out.println("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++2");
     	List<VEEduChasiVO> vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO);
     	
     	model.addAttribute("chasiList", vEEduChasiVOList);
     	
-    	
+    	System.out.println("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++1");
     	//파일 정보 가져오기
     	FileVO fileVO = new FileVO(); 
 		fileVO.setAtchFileId(vEEduAplctVO.getScholSealAtchFileId());
@@ -401,6 +448,8 @@ public class EduAplctTngrController {
 		model.addAttribute("fileList", result);
 		model.addAttribute("fileListCnt", result.size());
 		
+		System.out.println("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
+		
 		return "/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfy";
 	}	
 	

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java

@@ -52,4 +52,7 @@ public interface VEEduMIXService {
 	void updateRsltRprtFileId(VEEduAplctVO vEEduAplctVO) throws Exception;
 	//저작권 체험교실 목록
 	List<VEEduAplctVO> selectExprnPagingList(VEEduAplctVO paramVO) throws Exception;
+	
+	//신청서 임시 저장 리스트 불러오기
+	List<VEEduAplctVO> selectPagingList4Temp(VEEduAplctVO paramVO) throws Exception;
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java

@@ -143,4 +143,11 @@ public class VEEduMIXDAO extends EgovAbstractDAO {
 		List<VEEduAplctVO> tlist = (List<VEEduAplctVO>) list("VEEduMIXDAO.selectExprnPagingList", paramVO);
 		return tlist;
 	}		
+	
+	public List<VEEduAplctVO> selectPagingList4Temp(VEEduAplctVO paramVO) throws Exception {
+		@SuppressWarnings("unchecked")
+		List<VEEduAplctVO> tlist = (List<VEEduAplctVO>) list("VEEduMIXDAO.selectPagingList4Temp", paramVO);
+		return tlist;
+	}	
+	
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java

@@ -129,4 +129,9 @@ public class VEEduMIXServiceImpl implements VEEduMIXService {
 	public List<VEEduAplctVO> selectExprnPagingList(VEEduAplctVO paramVO) throws Exception{
 		return vEEduMIXDAO.selectExprnPagingList(paramVO);
 	}
+	
+	//paging List
+	public List<VEEduAplctVO> selectPagingList4Temp(VEEduAplctVO paramVO) throws Exception{
+		return vEEduMIXDAO.selectPagingList4Temp(paramVO);
+	}
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java

@@ -279,7 +279,7 @@ public class InstrPrflController {
         //강의조사 기간 여부
         VELctrDetailVO vELctrDetailVO = new VELctrDetailVO();
         //vELctrDetailVO.setSelectPagingListQuery("	AND	TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt");
-        vELctrDetailVO.setSelectPagingListQuery("	AND	TO_CHAR(SYSDATE,'YYYYMMDD') BETWEEN rsrch_strt_dt and rsrch_end_dt");
+        vELctrDetailVO.setSelectPagingListQuery("	AND	TO_CHAR(SYSDATE,'YYYY.MM.DD') BETWEEN rsrch_strt_dt and rsrch_end_dt");
         vELctrDetailVO = vELctrRsrchMngService.selectDetailWithQuery(vELctrDetailVO);
         model.addAttribute("vELctrDetailVO", vELctrDetailVO);
         

src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java

@@ -155,7 +155,7 @@ public class lctrTngrInfoStngController {
 		//날짜 표시 및 제출 버튼 노출 에 사용
         VELctrDetailVO vELctrRsrchDetailVO = new VELctrDetailVO();
         //vELctrDetailVO.setSelectPagingListQuery("	AND	TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt 	"
-        vELctrDetailVO.setSelectPagingListQuery("	AND	TO_CHAR(SYSDATE,'YYYYMMDD') BETWEEN rsrch_strt_dt and rsrch_end_dt 	"
+        vELctrDetailVO.setSelectPagingListQuery("	AND	TO_CHAR(SYSDATE,'YYYY.MM.DD') BETWEEN rsrch_strt_dt and rsrch_end_dt 	"
         		+ "	AND rsrch_instr_div='"+vELctrDetailVO.getRsrchInstrDiv()+"'	"
    				+ "	AND stng_yr_mnt='"+vELctrDetailVO.getStngYrMnt()+"'	");
         //vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetail(vELctrDetailVO);
@@ -335,7 +335,7 @@ public class lctrTngrInfoStngController {
         //2.오늘이 선택해서 들어온 강의조사의 기간 여부 체크
         VELctrDetailVO vELctrRsrchDetailVO = new VELctrDetailVO();
         //vELctrDetailVO.setSelectPagingListQuery("	AND	TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt 	"
-        vELctrDetailVO.setSelectPagingListQuery("	AND	TO_CHAR(SYSDATE,'YYYYMMDD') BETWEEN rsrch_strt_dt and rsrch_end_dt 	"
+        vELctrDetailVO.setSelectPagingListQuery("	AND	TO_CHAR(SYSDATE,'YYYY.MM.DD') BETWEEN rsrch_strt_dt and rsrch_end_dt 	"
         		+ "	AND rsrch_instr_div='"+vELctrDetailVO.getRsrchInstrDiv()+"'	"
    				+ "	AND stng_yr_mnt='"+vELctrDetailVO.getStngYrMnt()+"'	");
         //vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetail(vELctrDetailVO);

src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/service/impl/EduAplctMngAdultServiceImpl.java

@@ -1,5 +1,14 @@
 package kcc.ve.oprtn.adultVisitEdu.eduAplctMng.service.impl;
 
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartHttpServletRequest;
+import org.springframework.web.servlet.ModelAndView;
+
 import egovframework.rte.fdl.idgnr.EgovIdGnrService;
 import kcc.com.cmm.LoginVO;
 import kcc.com.cmm.service.EgovFileMngService;
@@ -8,18 +17,16 @@ import kcc.com.utl.user.service.CheckFileUtil;
 import kcc.com.utl.user.service.CheckLoginUtil;
 import kcc.let.utl.fcc.service.EgovCryptoUtil;
 import kcc.ve.cmm.VeConstants;
-import kcc.ve.instr.tngrVisitEdu.eduInfo.service.*;
+import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctOnlnService;
+import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService;
+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.prcsInfo.service.VEPrcsMIXService;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsOnlnCntntService;
 import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService;
 import kcc.ve.oprtn.adultVisitEdu.eduAplctMng.service.EduAplctMngAdultService;
-import org.springframework.stereotype.Service;
-import org.springframework.web.multipart.MultipartHttpServletRequest;
-import org.springframework.web.servlet.ModelAndView;
-
-import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import java.util.List;
 
 @Service("eduAplctMngAdultService")
 public class EduAplctMngAdultServiceImpl implements EduAplctMngAdultService {
@@ -135,7 +142,8 @@ public class EduAplctMngAdultServiceImpl implements EduAplctMngAdultService {
         for (int i=0;i<s_eduHopeDt.length;i++) {
             String eduChasiOrd = eduChasiGnrService.getNextStringId(); // 교육차시 순번
             vEEduChasiVO.setEduChasiOrd(eduChasiOrd);
-            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            //vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i]);
             vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setLrnTm(s_lrnTm[i]);
@@ -215,7 +223,8 @@ public class EduAplctMngAdultServiceImpl implements EduAplctMngAdultService {
         for (int i=0;i<s_eduHopeDt.length;i++) {
             String eduChasiOrd = eduChasiGnrService.getNextStringId(); // 교육차시 순번
             vEEduChasiVO.setEduChasiOrd(eduChasiOrd);
-            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            //vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i]);
             vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setLrnTm(s_lrnTm[i]);

src/main/java/kcc/ve/oprtn/instr/adultVisitEdu/instrInfo/web/OprtnInstrAdultPrflContoller.java

@@ -229,7 +229,8 @@ public class OprtnInstrAdultPrflContoller {
 	    		comDefaultVO.setSearchKeyword(vEInstrDetailVO.getSearchKeyword());
 	    		comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO);
 	    		vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword());
-	    		selectCondition += "AND	a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')";
+	    		//selectCondition += "AND	a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')";
+	    		selectCondition += "AND	a.instr_nm LIKE '%'||'" +vEInstrDetailVO.getSearchKeyword() + "'||'%'";
 	    		comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO);
 	    		vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword());
 	    	}
@@ -1014,9 +1015,11 @@ public class OprtnInstrAdultPrflContoller {
 	    	//3. SelectPagingListQuery set 할 조건 설정
 	    	String selectCondition = new String();
 	    	//3.1 제출 완료 후 사용중인 데이터 조회
-	    	selectCondition += "AND	a.sbmt_yn='Y' AND a.use_yn = 'Y'";
+	    	//selectCondition += "AND	a.sbmt_yn='Y' AND a.use_yn = 'Y'";
+	    	selectCondition += "AND	a0.sbmt_yn='Y' AND a0.use_yn = 'Y'";
 	    	//3.2 강사 테이블 성인강사여부 Y인것만 조회
-	    	selectCondition += "AND	(b.adult_instr_yn ='Y' OR a.qlfct_end_yn = 'Y') ";
+	    	//selectCondition += "AND	(b.adult_instr_yn ='Y' OR a.qlfct_end_yn = 'Y') ";
+	    	selectCondition += "AND	(b0.adult_instr_yn ='Y' OR a0.qlfct_end_yn = 'Y') ";
 	    	//3.3 이름 검색 시
 	    	if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchKeyword())){
 	    		//selectCondition += "AND	a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')";
@@ -1088,6 +1091,10 @@ public class OprtnInstrAdultPrflContoller {
 	        //요청사항 있는지 체크
 	        vEInstrDetailVODetail.setRqstCnt(vEInstrDetailVO.getRqstCnt());
 	        vEInstrDetailVODetail	=	egovCryptoUtil.decryptVEInstrDetailVO(vEInstrDetailVODetail);
+	        System.out.println("vEInstrDetailVODetail");
+	        System.out.println(vEInstrDetailVODetail.toString());
+	        System.out.println(vEInstrDetailVODetail.toString());
+	        
 			model.addAttribute("info", vEInstrDetailVODetail);
 
 			if(StringUtils.isNotBlank(vEInstrDetailVODetail.getPhtAtchFileId())){
@@ -1605,12 +1612,53 @@ public class OprtnInstrAdultPrflContoller {
 				vEInstrDetailVO.setAdultInstrYn("Y");
 				vEInstrDetailVO.setApptDt(now2);;
 			}
+			
+	        //암호화
+	        vEInstrDetailVO	=	egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVO);
+			
 			vEInstrDetailService.update(vEInstrDetailVO);
 			vEInstrService.update(vEInstrDetailVO);
 
 			return "redirect:/ve/oprtn/instr/adultVisitEdu/instrInfo/instrMngList.do";
 		}	    
 		
+	    /**
+		 *  강사 정보 수정 
+		 */		
+		@RequestMapping("/ve/oprtn/instr/adultVisitEdu/instrInfo/instrMdfyAjax.do")
+		public ModelAndView instrMdfyAjax(
+				@ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO
+				
+				, ModelMap model
+				, HttpSession session
+				, HttpServletRequest request
+				) throws Exception {
+			ModelAndView modelAndView = new ModelAndView();
+			modelAndView.setViewName("jsonView");	
+			
+			//로그인 처리====================================
+			//로그인 정보 가져오기
+	        LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+	        SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request);	//SSO 로그인 정보 가져오기
+	        
+			//로그인 처리====================================  
+	        //a
+	        vEInstrDetailVO.setLastUpdusrId(loginVO.getUniqId());
+	        //암호화
+	        vEInstrDetailVO	=	egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVO);
+	        
+			int i_ret	=	vEInstrDetailService.update(vEInstrDetailVO);
+			//vEInstrService.update(vEInstrDetailVO);
+			
+			if (i_ret>0)	modelAndView.addObject("result", "success");
+			else modelAndView.addObject("result", "fail");
+			
+			
+
+			//return "redirect:/ve/oprtn/instr/adultVisitEdu/instrInfo/instrMngList.do";
+			return modelAndView;
+		}	  
+		
 	    //페이징을 위한 처리 step1 - 페이징 기본 정보 설정
 	    private PaginationInfo setPagingStep1(
 	    		VEInstrDetailVO p_vEInstrDetailVO

src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java

@@ -1630,7 +1630,7 @@ public class OprtnInstrTngrPrflContoller {
 	    	//3.1 제출 완료 후 사용중인 데이터 조회
 	    	selectCondition += "AND	a0.sbmt_yn='Y' AND a0.use_yn = 'Y'";
 	    	//3.2 강사 테이블 성인강사여부 Y인것만 조회
-	    	selectCondition += "AND	(b0.tngr_instr_yn ='Y' OR a0.qlfct_end_yn = 'Y') ";
+	    	//selectCondition += "AND	(b0.tngr_instr_yn ='Y' OR a0.qlfct_end_yn = 'Y') ";
 	    	//3.3 이름 검색 시
 	    	if(StringUtil.isNotEmpty(vEInstrDetailVO.getSearchKeyword())){
 	    		//이름 암호화 - comDefaultVO 검색단어 공통 암호화
@@ -1638,7 +1638,8 @@ public class OprtnInstrTngrPrflContoller {
 	    		comDefaultVO.setSearchKeyword(vEInstrDetailVO.getSearchKeyword());
 	    		comDefaultVO = egovCryptoUtil.encryptComDefaultVO(comDefaultVO);
 	    		vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword());
-	    		selectCondition += "AND	a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')";
+	    		//selectCondition += "AND	a.instr_nm LIKE CONCAT ('%', '" +vEInstrDetailVO.getSearchKeyword() + "', '%')";
+	    		selectCondition += "AND	a0.instr_nm LIKE '%'||'" +vEInstrDetailVO.getSearchKeyword() + "'||'%'";
 	    		comDefaultVO = egovCryptoUtil.decryptComDefaultVO(comDefaultVO);
 	    		vEInstrDetailVO.setSearchKeyword(comDefaultVO.getSearchKeyword());
 	    	}
@@ -1955,7 +1956,7 @@ public class OprtnInstrTngrPrflContoller {
 	        //강의조사 기간 여부
 	        VELctrDetailVO vELctrRsrchDetailVO = new VELctrDetailVO();
 	        //vELctrDetailVO.setSelectPagingListQuery("	AND	TO_CHAR(SYSDATETIME,'yyyymmdd') BETWEEN rsrch_strt_dt and rsrch_end_dt 	"
-	        vELctrDetailVO.setSelectPagingListQuery("	AND	TO_CHAR(SYSDATE,'YYYYMMDD') BETWEEN rsrch_strt_dt and rsrch_end_dt 	"
+	        vELctrDetailVO.setSelectPagingListQuery("	AND	TO_CHAR(SYSDATE,'YYYY.MM.DD') BETWEEN rsrch_strt_dt and rsrch_end_dt 	"
 	        		+ "	AND rsrch_instr_div='"+vELctrDetailVO.getRsrchInstrDiv()+"'	"
 	   				+ "	AND stng_yr_mnt='"+vELctrDetailVO.getStngYrMnt()+"'	");
 	        //vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetail(vELctrDetailVO);
@@ -2308,6 +2309,10 @@ public class OprtnInstrTngrPrflContoller {
 				vEInstrDetailVO.setTngrInstrYn("Y");
 				vEInstrDetailVO.setApptDt(now2);;
 			}
+			
+	        //암호화
+	        vEInstrDetailVO	=	egovCryptoUtil.encryptVEInstrDetailVO(vEInstrDetailVO);
+			
 			vEInstrDetailService.update(vEInstrDetailVO);
 			vEInstrService.update(vEInstrDetailVO);
 

src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/service/impl/EduAplctMngTngrServiceImpl.java

@@ -175,7 +175,8 @@ public class EduAplctMngTngrServiceImpl implements EduAplctMngTngrService {
         for (int i=0;i<s_eduHopeDt.length;i++) {
             String eduChasiOrd = eduChasiGnrService.getNextStringId(); // 교육차시 순번
             vEEduChasiVO.setEduChasiOrd(eduChasiOrd);
-            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            //vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i]);
             vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setLrnTm(s_lrnTm[i]);
@@ -263,7 +264,8 @@ public class EduAplctMngTngrServiceImpl implements EduAplctMngTngrService {
         for (int i=0;i<s_eduHopeDt.length;i++) {
             String eduChasiOrd = eduChasiGnrService.getNextStringId(); // 교육차시 순번
             vEEduChasiVO.setEduChasiOrd(eduChasiOrd);
-            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            //vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i]);
             vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setLrnTm(s_lrnTm[i]);
@@ -345,7 +347,8 @@ public class EduAplctMngTngrServiceImpl implements EduAplctMngTngrService {
         for (int i=0;i<s_eduHopeDt.length;i++) {
             String eduChasiOrd = eduChasiGnrService.getNextStringId(); // 교육차시 순번
             vEEduChasiVO.setEduChasiOrd(eduChasiOrd);
-            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            //vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i]);
             vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
             vEEduChasiVO.setLrnTm(s_lrnTm[i]);
@@ -421,24 +424,32 @@ public class EduAplctMngTngrServiceImpl implements EduAplctMngTngrService {
 	        String[] s_divCd	=	request.getParameterValues("divCd");
 	        String[] s_trgt	=	request.getParameterValues("trgt");
 	        String[] s_prsnl	=	request.getParameterValues("prsnl");
+	        
+	        String[] s_eduChasiOrd	=	request.getParameterValues("eduChasiOrd");
+	        
 	
 	        VEEduChasiVO vEEduChasiVO	=	new VEEduChasiVO();
 	        vEEduChasiVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd());
 	        vEEduChasiVO.setFrstRegisterId(loginVO.getUniqId());	//esntl_id
 	
 	        //차시 전체 삭제
-	        vVEEduChasiService.delete(vEEduChasiVO);
+	        //기존값을 수정하는 것으로 변경	2023-10-11
+	        //vVEEduChasiService.delete(vEEduChasiVO);
+	        
 	        for (int i=0;i<s_eduHopeDt.length;i++) {
-	            String eduChasiOrd = eduChasiGnrService.getNextStringId(); // 교육차시 순번
+	            //String eduChasiOrd = eduChasiGnrService.getNextStringId(); // 교육차시 순번
-	            vEEduChasiVO.setEduChasiOrd(eduChasiOrd);
+	            vEEduChasiVO.setEduChasiOrd(s_eduChasiOrd[i]);
-	            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+	            vEEduChasiVO.setLastUpdusrId(loginVO.getUniqId());
+	            //vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+	            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i]);
 	            vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
 	            vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
 	            vEEduChasiVO.setLrnTm(s_lrnTm[i]);
 	            vEEduChasiVO.setDivCd(s_divCd[i]);
 	            vEEduChasiVO.setTrgt(s_trgt[i]);
 	            vEEduChasiVO.setPrsnl(s_prsnl[i]);
-	            vVEEduChasiService.insert(vEEduChasiVO);
+	            //vVEEduChasiService.insert(vEEduChasiVO);
+	            vVEEduChasiService.update(vEEduChasiVO);
 	        }
 //        }
         return true;
@@ -518,7 +529,8 @@ public class EduAplctMngTngrServiceImpl implements EduAplctMngTngrService {
 	        for (int i=0;i<s_eduHopeDt.length;i++) {
 	            String eduChasiOrd = eduChasiGnrService.getNextStringId(); // 교육차시 순번
 	            vEEduChasiVO.setEduChasiOrd(eduChasiOrd);
-	            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+	            //vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i].replaceAll("[^0-9]",""));
+	            vEEduChasiVO.setEduHopeDt(s_eduHopeDt[i]);
 	            vEEduChasiVO.setStrtTm(s_strtTm[i].replaceAll("[^0-9]",""));
 	            vEEduChasiVO.setEndTm(s_endTm[i].replaceAll("[^0-9]",""));
 	            vEEduChasiVO.setLrnTm(s_lrnTm[i]);

src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduAplctMng/web/EduAplctMngTngrController.java

@@ -473,6 +473,8 @@ public class EduAplctMngTngrController {
 		model.addAttribute("info", vEEduAplctVO);
 
 
+		System.out.println("=========================1");
+		
 		//사용자 교육신청 과정 리스트
 		VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO();
 		vEPrcsDetailVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd());
@@ -480,6 +482,7 @@ public class EduAplctMngTngrController {
 		vEPrcsDetailVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_10);
 		List<VEPrcsDetailVO> vEPrcsDetailVOList = vEPrcsService.selectTngrPrcsList(vEPrcsDetailVO);
 
+		System.out.println("=========================12");
 		model.addAttribute("list", vEPrcsDetailVOList);
 
 
@@ -490,6 +493,7 @@ public class EduAplctMngTngrController {
 
 		List<VEEduChasiVO> vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO);
 
+		System.out.println("=========================13");
 		model.addAttribute("chasiList", vEEduChasiVOList);
 
 
@@ -500,6 +504,8 @@ public class EduAplctMngTngrController {
 		model.addAttribute("fileList", result);
 		model.addAttribute("fileListCnt", result.size());
 
+		System.out.println("=========================14");
+		
 		return "oprtn/tngrVisitEdu/eduAplctMngReg";
 	}
 

src/main/resources/egovframework/sqlmap/let/sym/ccm/ccc/EgovCmmnClCodeManage_SQL_Tibero.xml

@@ -91,9 +91,9 @@
 		         ,  #clCodeNm#
 		         ,  #clCodeDc#
 		         ,  #useAt#
-		         ,  NOW()
+		         ,  SYSDATE
 		         ,  #frstRegisterId#
-		         ,  NOW()
+		         ,  SYSDATE
 		         ,  #frstRegisterId#
 		         ) 
 		]]>
@@ -105,7 +105,7 @@
                SET  CL_CODE_NM        = #clCodeNm#
                  ,  CL_CODE_DC        = #clCodeDc#
                  ,  USE_AT            = #useAt#
-                 ,  LAST_UPDT_PNTTM = NOW()
+                 ,  LAST_UPDT_PNTTM = SYSDATE
                  ,  LAST_UPDUSR_ID    = #lastUpdusrId#
              WHERE  CL_CODE           = #clCode# 
 		]]>
@@ -132,7 +132,7 @@
                SET  CL_CODE_NM        = #clCodeNm#
                  ,  CL_CODE_DC        = #clCodeDc#
                  ,  USE_AT            = #useAt#
-                 ,  LAST_UPDT_PNTTM   = NOW()
+                 ,  LAST_UPDT_PNTTM   = SYSDATE
                  ,  LAST_UPDUSR_ID    = #lastUpdusrId#
                  ,  CL_CODE           = #clCode#
              WHERE  CL_CODE           = #tempClCode#
@@ -143,7 +143,7 @@
 		<![CDATA[
             UPDATE  LETTCCMMNCLCODE 
                SET  CL_CODE_NM        = #clCodeNm#
-                 ,  LAST_UPDT_PNTTM   = NOW()
+                 ,  LAST_UPDT_PNTTM   = SYSDATE
                  ,  LAST_UPDUSR_ID    = #lastUpdusrId#
              WHERE  CL_CODE           = #clCode# 
 		]]>

src/main/resources/egovframework/sqlmap/let/sym/ccm/cde/EgovCmmnDetailCodeManage_SQL_Tibero.xml

@@ -103,9 +103,9 @@
 		         ,  #codeNm#
 		         ,  #codeDc#
 		         ,  #useAt#
-		         ,  NOW()
+		         ,  SYSDATE
 		         ,  #frstRegisterId#
-		         ,  NOW()
+		         ,  SYSDATE
 		         ,  #frstRegisterId#
 		         ) 
 		]]>
@@ -117,7 +117,7 @@
                SET  CODE_NM           = #codeNm#
                  ,  CODE_DC           = #codeDc#
                  ,  USE_AT            = #useAt#
-                 ,  LAST_UPDT_PNTTM = NOW()
+                 ,  LAST_UPDT_PNTTM = SYSDATE
                  ,  LAST_UPDUSR_ID    = #lastUpdusrId#
              WHERE  CODE_ID   = #codeId# 
                AND  CODE      = #code#
@@ -185,7 +185,7 @@
                  <isNotEmpty property="useAt">
                  	,  USE_AT            = #useAt#
                  </isNotEmpty>
-                 ,  LAST_UPDT_PNTTM = NOW()
+                 ,  LAST_UPDT_PNTTM = SYSDATE
                  ,  LAST_UPDUSR_ID    = #lastUpdusrId#
                  ,  CODE           = #code#
              WHERE  CODE_ID   = #codeId# 

src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml

@@ -1570,7 +1570,7 @@
 							       AND     c.use_yn   ='Y'			/*	사용중인강의설정	*/
 							       AND     b.instr_div=c.instr_div
 							       AND     b.user_id  =c.user_id
-							       AND		IFNULL(b.qlfct_end_yn,'N')='N'
+							       AND		NVL(b.qlfct_end_yn,'N')='N'
 							       			/*
 							               (
 							                       b.qlfct_end_yn='N' OR b.qlfct_end_yn IS NULL
@@ -1611,7 +1611,7 @@
 			              AND      a.edu_aplct_ord=b.edu_aplct_ord
 			              AND      a.edu_chasi_ord=b.edu_chasi_ord
 			              AND      a.edu_aplct_ord=c.edu_aplct_ord
-			              AND		IFNULL(c.use_yn,'Y')='Y'
+			              AND		NVL(c.use_yn,'Y')='Y'
 			              
 						  /*	교육확정된 수업만 계산	*/
 						  /*
@@ -3476,7 +3476,7 @@
 			, aaaaaa.edu_chasi_ord	AS	eduChasiOrd
 			, aaaaaa.user_id			AS	userId
 			
-			, IFNULL(aaaaaa.lrn_tm_sum,0)	AS	lrnTmSum
+			, NVL(aaaaaa.lrn_tm_sum,0)	AS	lrnTmSum
 			
           	, aaaaaa.instr_nm      AS instrNm 
           
@@ -3498,11 +3498,26 @@
           
           	, aaaaaa.rsdne		
           	
-          	, bbbbbb.user_id			AS	chrgNm	
+          	, bbbbbb.user_id			AS	chrgNm
+          	/*	
           	, IF (dddddd.cntnsCnt>1 AND      aaaaaa.user_id     =cccccc.user_id,1 ,0 ) 
           		+ IF (dddddd.cntnsCnt>1 ,IF(aaaaaa.cntns_lctr_psbl_yn='Y',1,0) ,0 ) 
           		+ IFNULL(aaaaaa.pnlty_cnt,0)*-1 + IF((aaaaaa.area_cnt)>0,1,0) + IF((aaaaaa.checkTop)>0,1,0) + IFNULL(CAST(aaaaaa.lrn_tm_sum AS DOUBLE)/(aaaaaa.mnt_mnmm_tm+1),0)*-1 AS checkTopSum
-           	
+          		*/
+          	, CASE WHEN dddddd.cntnsCnt>1 AND      aaaaaa.user_id     =cccccc.user_id THEN 1 ELSE 0 END 
+          		+ CASE WHEN dddddd.cntnsCnt>1 THEN 
+          											DECODE(aaaaaa.cntns_lctr_psbl_yn,'Y',1,0) 
+          										ELSE 0 END 
+          		
+          		+ NVL(aaaaaa.pnlty_cnt,0)*-1 
+          		+ CASE WHEN aaaaaa.area_cnt>0	THEN 1	ELSE 0	END 
+          		+ CASE WHEN aaaaaa.checkTop>0	THEN 1	ELSE 0	END 
+          		+ NVL(
+          				CAST(aaaaaa.lrn_tm_sum AS NUMBER)/(aaaaaa.mnt_mnmm_tm+1)
+          				,0
+          				)
+          		*-1 
+          		AS checkTopSum           	
           	
  		  		, aaaaaa.onewayDstnc
  		  		, aaaaaa.scholAddr
@@ -4503,7 +4518,7 @@
         /*	VEAsgnmMIXDAO.selectInstrDstncStep1	*/
         SELECT   b.new_addr 	AS	sAddr
         	, d.addr			AS	iAddr
-        	, ifnull(e.oneway_dstnc,'')	AS	onewayDstnc	
+        	, NVL(e.oneway_dstnc,'')	AS	onewayDstnc	
         	, a.schol_instt_nm	AS	scholInsttNm
         	, a.edu_aplct_ord	AS	eduAplctOrd
         	, c.edu_chasi_ord	AS	eduChasiOrd
@@ -4520,7 +4535,7 @@
         	
         WHERE    1    =1
         AND a.stndrd_schol_cd=b.stndrd_schol_cd                    
-        AND      IFNULL(A.USE_YN, 'Y')   != 'N'
+        AND      NVL(A.USE_YN, 'Y')   != 'N'
         AND      A.SBMT_YN                = 'Y'
         AND      A.LCTR_DIV_CD            = '10'
         AND      A.APRVL_CD IN ( '60')
@@ -4565,8 +4580,8 @@
 		<isEmpty property="searchCondition">
 			<isNotEmpty property="searchKeyword">
 				AND (
-					A.SCHOL_INSTT_NM LIKE CONCAT('%' , #searchKeyword# , '%') OR
+					A.SCHOL_INSTT_NM LIKE '%' || #searchKeyword# || '%' OR
-					A.INSTT_NM LIKE CONCAT('%' , #searchKeyword# , '%')
+					A.INSTT_NM LIKE '%' || #searchKeyword# || '%'
 				)
 			</isNotEmpty>
 		</isEmpty>
@@ -4588,7 +4603,7 @@
 
         
 						        
-        ORDER BY 1=1 ,
+        ORDER BY 1 ,
                  A.EDU_APLCT_ORD DESC
 			
 	</select>
@@ -4811,7 +4826,7 @@
 		/*	VEAsgnmMIXDAO.selectTtlMntChasiSumDetail	*/
 		SELECT aa0.sumMntChasi ,
 		       bb0.sumMntLctr ,
-		       CEIL(CAST(aa0.sumMntChasi AS DOUBLE)/bb0.sumMntLctr) AS mxmmChasi
+		       CEIL(CAST(aa0.sumMntChasi AS NUMBER)/bb0.sumMntLctr) AS mxmmChasi
 		FROM   ( SELECT  SUBSTRING(b.edu_hope_dt,1,6) AS eduHopeMnt ,
 		                SUM(b.chasi)                  AS sumMntChasi
 		       FROM     ve_edu_aplct a ,
@@ -4825,7 +4840,7 @@
 		                c0
 		       WHERE    a.aprvl_cd                   ='60'
 		       AND      a.lctr_div_cd                ='10'
-		       AND      IFNULL(a.use_yn,'Y')         ='Y'
+		       AND      NVL(a.use_yn,'Y')         ='Y'
 		       AND      a.edu_aplct_ord              = b.edu_aplct_ord
 		       AND      SUBSTRING(b.edu_hope_dt,1,6) =SUBSTRING(c0.edu_hope_dt,1,6)
 		       GROUP BY SUBSTRING(b.edu_hope_dt,1,6)
@@ -4837,7 +4852,20 @@
 		                         aaa.sum_lctr_cnt ,
 		                         COUNT(*) cnt
 		                FROM     ( SELECT aa.instr_div ,
-		                                 IF (mon_lctr_yn='Y',1,0) + IF (tue_lctr_yn='Y',1,0) + IF (wed_lctr_yn='Y',1,0) + IF (thu_lctr_yn='Y',1,0) + IF (fri_lctr_yn='Y',1,0) AS sum_lctr_cnt
+		                /*
+		                                 IF (mon_lctr_yn='Y',1,0) 
+		                                 + IF (tue_lctr_yn='Y',1,0) 
+		                                 + IF (wed_lctr_yn='Y',1,0) 
+		                                 + IF (thu_lctr_yn='Y',1,0) 
+		                                 + IF (fri_lctr_yn='Y',1,0) 
+		                                 AS sum_lctr_cnt
+		                                 */
+		                                 DECODE(mon_lctr_yn,'Y',1,0) 
+		                                 + DECODE(tue_lctr_yn,'Y',1,0) 
+		                                 + DECODE(wed_lctr_yn,'Y',1,0) 
+		                                 + DECODE(thu_lctr_yn,'Y',1,0) 
+		                                 + DECODE(fri_lctr_yn,'Y',1,0) 
+		                                 AS sum_lctr_cnt		                                 
 		                         FROM    (
 		                                 /* 신청 가능한 전체 강사 리스트 */
 		                                 SELECT  c.* ,
@@ -4856,7 +4884,7 @@
 		                                         /* 사용중인강의설정 */
 		                                 AND     b.instr_div               =c.instr_div
 		                                 AND     b.user_id                 =c.user_id
-		                                 AND     IFNULL(b.qlfct_end_yn,'N')='N'
+		                                 AND     NVL(b.qlfct_end_yn,'N')='N'
 		                                 AND     b.instr_div               ='10'
 		                                 )
 		                                 aa

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

@@ -508,7 +508,10 @@
 		</isNotEmpty>
 		<isNotEmpty property="sbmtYn">
 			, SBMT_YN	= #sbmtYn#			
+			/*
 			, SBMT_PNTTM	= IF(SBMT_PNTTM is null, SYSDATE, SBMT_PNTTM)
+			*/
+			, SBMT_PNTTM	= CASE WHEN SBMT_PNTTM is null THEN SYSDATE ELSE SBMT_PNTTM END
 		</isNotEmpty>
 		<isNotEmpty property="aprvlCd">
 			, APRVL_CD	= #aprvlCd#
@@ -1043,7 +1046,7 @@
 	<select id="VEEduAplctDAO.selectTotalChasi" parameterClass="VEEduAplctVO" resultClass="int">
 		/*	VEEduAplctDAO.selectTotalChasi	*/
 		SELECT 
-			ifnull(sum(chasi),0) AS totalLrnTm
+			NVL(sum(chasi),0) AS totalLrnTm
 		FROM
 			ve_edu_aplct a
 		INNER JOIN 

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

@@ -57,7 +57,10 @@
 	<sql id="VEEduChasiDAO.select_column_name">
 			A.EDU_APLCT_ORD			AS	eduAplctOrd,
        		A.EDU_CHASI_ORD			AS	eduChasiOrd,
+       		/*
 	       	CASE WHEN A.EDU_HOPE_DT IS NOT NULL AND A.EDU_HOPE_DT != ''  THEN TO_CHAR(TO_DATE(a.EDU_HOPE_DT, 'YYYYMMDD'), 'YYYY.MM.dd') ELSE '' END AS eduHopeDt,
+	       	*/
+	       	A.EDU_HOPE_DT			AS	eduHopeDt,
 	       	A.STRT_TM				AS	strtTm,
 	       	A.END_TM				AS	endTm,
 	       	A.LRN_TM				AS	lrnTm,
@@ -115,6 +118,8 @@
 
 	<!-- 강사 등록 C -->
 	<insert id="VEEduChasiDAO.insert" parameterClass="VEEduChasiVO">
+	
+		/*	VEEduChasiDAO.insert	*/
 				
 		INSERT INTO <include refid="VEEduChasiDAO.table_name"/> (
 			<include refid="VEEduChasiDAO.column_name"/>
@@ -123,7 +128,7 @@
 			#eduAplctOrd#,
        		#eduChasiOrd#,
        		
-	       	TRIM(REPLACE(#eduHopeDt#,'.','')),
+	       	TRIM(#eduHopeDt#),
 			REPLACE(#strtTm#,':',''),
 			REPLACE(#endTm#,':',''),
 	       	#lrnTm#,
@@ -175,6 +180,7 @@
 	
 	<!-- 강사 정보 U -->
 	<update id="VEEduChasiDAO.update" parameterClass="VEEduChasiVO">
+		/*	VEEduChasiDAO.update	*/
 		UPDATE
 			<include refid="VEEduChasiDAO.table_name"/>
 		SET
@@ -186,7 +192,7 @@
 
 
 		<isNotEmpty property="eduHopeDt">
-			, edu_hope_dt	= REPLACE(#eduHopeDt#,'.','')
+			, edu_hope_dt	= TRIM(#eduHopeDt#)
 		</isNotEmpty><isNotEmpty property="strtTm">
 			, strt_tm	= REPLACE(#strtTm#,':','')
 		</isNotEmpty><isNotEmpty property="endTm">
@@ -271,14 +277,18 @@
 		<isNotEmpty property="eduAplctOrd">
 			AND A.EDU_APLCT_ORD = #eduAplctOrd#
 		</isNotEmpty>
-		ORDER BY 1=1
+		ORDER BY 1
 		<isEmpty property="orderByQuery">
 			, A.EDU_APLCT_ORD DESC
 		</isEmpty>
 		<isNotEmpty property="orderByQuery">
 			, $orderByQuery$
 		</isNotEmpty>
-		LIMIT #recordCountPerPage# OFFSET #firstIndex#
+		
+		/*
+		LIMIT recordCountPerPage OFFSET firstIndex
+		*/
+		OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;			
 	</select>
 	
 	<update id="VEEduChasiDAO.updateInstrCnfrmId" parameterClass="VEEduChasiVO">

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

@@ -2145,7 +2145,10 @@
 		, A.INSTT_DIV_CD                             AS insttDivCd 
 		, A.EDU_SLCT_CD                        AS eduSlctCd 
 		, B.EDU_CHASI_ORD                             AS eduChasiOrd
+		/*
 		, TO_CHAR(B.EDU_HOPE_DT,'YYYY.MM.DD')       AS eduHopeDt
+		*/
+		, B.EDU_HOPE_DT							       AS eduHopeDt
 		, B.STRT_TM                                   AS strtTm
 		, B.END_TM                                    AS endTm
 		, B.LRN_TM                                    AS lrnTm
@@ -3546,4 +3549,427 @@ VALUES
 		</isNotEmpty>
 		OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
 	</select>
+	
+	<!-- 임시 저장 불러오기 L page -->
+	<select id="VEEduMIXDAO.selectPagingList4Temp" parameterClass="VEEduAplctVO" resultClass="VEEduAplctVO">
+		/*	임시.*NOT_SQL_LOG.*  VEEduMIXDAO.selectPagingList4Temp	*/
+		SELECT
+			  COUNT(1) OVER() AS totCnt
+			, ROWNUM AS rowNo
+			, A.EDU_CN AS eduCn
+			
+			, A.EDU_SLCT_CD AS eduSlctCd
+			, A.EDU_SLCT_AREA_CD AS eduSlctAreaCd
+			, A.SCHOL_DIV_CD AS scholDivCd
+			, A.APRVL_CD AS aprvlCd
+			, TO_CHAR(A.APRVL_PNTTM, 'YYYY.MM.DD')  AS aprvlPnttm
+			
+			, A.EDU_PLACE AS eduPlace
+			
+			, A.SBMT_YN AS sbmtYn
+			, TO_CHAR(A.SBMT_PNTTM, 'YYYY.MM.DD') AS sbmtPnttm
+			
+			, A.SCHOL_INSTT_NM AS scholInsttNm
+            
+            , A.INSTT_NM AS InsttNm
+			
+			, A.EDU_APLCT_ORD AS eduAplctOrd
+            , A.EDU_TRGT AS eduTrgt
+            , A.EDU_PRSNL AS eduPrsnl
+            , A.CHRG_NM AS chrgNm
+			, A.JOB_NM AS jobNm
+			, A.USE_YN AS useYn
+			, A.MDFY_RQST_YN AS mdfyRqstYn
+			, A.EQPMN_CN AS eqpmnCn
+			, A.BLNG AS blng
+			, A.DPRTM AS dprtm
+			, A.FULL_NAME AS fullName
+			, A.PSTN AS pstn
+			, A.PRPS AS prps
+			, A.RPRT_SBMT_DT AS rprtSbmtDt
+			, A.hope_sbjct AS hopeSbjct 
+			, A.isltn_schol_yn AS isltnScholYn
+			, A.clphone	AS	clphone
+			, A.phone AS phone
+			, A.Email AS email
+			, A.Addr AS addr
+			, A.IS_WAIT AS isWait
+			, A.CORPS_EDU AS corpsEdu
+			, A.BROADROOM_EDU AS broadroomEdu
+			, A.ADMIN_UPDT_YN AS adminUpdtYn
+			,(
+		  		 SELECT
+		  		 		MAX(S2.PRCS_NM)||
+						CASE WHEN COUNT(*) >  1 THEN '외' || (COUNT(*)-1)
+						ELSE ''  END AS  PRCS_NM
+					FROM VE_EDU_APLCT_ONLN S1 INNER JOIN VE_PRCS S2
+													ON S1.PRCS_ORD = S2.PRCS_ORD
+					WHERE 1=1
+					AND S1.EDU_APLCT_ORD = A.EDU_APLCT_ORD
+					GROUP BY S1.EDU_APLCT_ORD
+					/*
+					ORDER BY S1.PRCS_ORD
+					*/
+			) AS prcsGroupNm
+			, A.INSTT_DIV_CD AS insttDivCd
+            , A.FRST_REGISTER_ID AS	frstRegisterId
+            , TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYY.MM.DD') AS frstRegistPnttm
+
+			, (
+					SELECT 
+						S4.end_pnttm 
+					FROM ve_prcs_aplct_prd S4 
+					WHERE S4.prcs_aplct_prd_ord = A.prcs_ord
+			) AS prcsEndPnttm
+			,(
+					SELECT
+					/*
+						COUNT(1)
+						*/ 
+						sum(NVL(chasi,1))
+					FROM ve_edu_chasi Z
+					WHERE Z.edu_aplct_ord = A.edu_aplct_ord
+			) AS chasiCnt
+			,
+			( SELECT
+				COUNT(1)
+				FROM ve_acmdt_aplct ZZ
+				, VE_EDU_CHASI YY
+				WHERE   A.EDU_APLCT_ORD = ZZ.EDU_APLCT_ORD
+				AND 	ZZ.EDU_APLCT_ORD = YY.EDU_APLCT_ORD
+				AND 	ZZ.EDU_CHASI_ORD = YY.EDU_CHASI_ORD
+				AND     ZZ.sbmt_yn      = 'Y'
+				AND	  	ZZ.APRVL_CD = '10'
+			) AS acmdtCnt,
+			( SELECT COUNT(1)
+				FROM    VE_ACMDT_APLCT ZZ
+				, VE_EDU_CHASI YY
+				WHERE   A.EDU_APLCT_ORD = ZZ.EDU_APLCT_ORD
+				AND 	ZZ.EDU_APLCT_ORD = YY.EDU_APLCT_ORD
+				AND 	ZZ.EDU_CHASI_ORD = YY.EDU_CHASI_ORD
+				AND     ZZ.SBMT_YN      = 'Y'
+			 ) AS acmdtAllCnt
+			 
+             ,(
+             
+		        SELECT COUNT(*)
+		        FROM     ve_prcs_cmplt_detail a0
+		                 INNER JOIN ve_prcs b0
+		                 ON       a0.prcs_ord = b0.prcs_ord
+		                 INNER JOIN ve_prcs_onln_cntnt c0
+		                 ON       c0.prcs_onln_cntnt_ord = a0.prcs_onln_cntnt_ord
+		        WHERE    1                              =1
+		        AND      a0.edu_aplct_ord                =A.EDU_APLCT_ORD
+		        AND NVL(a0.sbmt_yn,'N')='Y'                 
+             
+             ) AS isEndCnt		
+
+             ,(
+             
+		        SELECT sum(a0.EDU_PRSNL)
+		        FROM     ve_prcs_cmplt_detail a0
+		                 INNER JOIN ve_prcs b0
+		                 ON       a0.prcs_ord = b0.prcs_ord
+		                 INNER JOIN ve_prcs_onln_cntnt c0
+		                 ON       c0.prcs_onln_cntnt_ord = a0.prcs_onln_cntnt_ord
+		        WHERE    1                              =1
+		        AND      a0.edu_aplct_ord                =A.EDU_APLCT_ORD
+		        AND NVL(a0.sbmt_yn,'N')='Y'                 
+             
+             ) AS endEduPrsnl		
+             
+			 
+		FROM VE_EDU_APLCT A 
+		
+		WHERE 1=1
+		AND NVL(A.USE_YN, 'Y') <![CDATA[ <> ]]> 'N'
+
+		<isEmpty property="sbmtYn">
+			AND A.SBMT_YN = 'Y'
+		</isEmpty>
+
+		<isNotEmpty property="sbmtYn">
+			AND A.SBMT_YN != 'Y'
+		</isNotEmpty>
+
+		<isNotEmpty property="searchAcmdtCnt">
+			AND 
+			(
+	         	SELECT
+	         		COUNT(1)
+	         	FROM
+	         		ve_acmdt_aplct ZZ
+	         	WHERE
+	         		A.edu_aplct_ord = ZZ.edu_aplct_ord
+	         	AND
+	         		ZZ.sbmt_yn = 'Y'
+	         ) > 0
+		</isNotEmpty>
+
+		<isNotEmpty property="lctrDivCd">
+			AND A.LCTR_DIV_CD = #lctrDivCd#
+		</isNotEmpty>
+
+		<isNotEmpty property="aprvlCd">
+			AND A.APRVL_CD=#aprvlCd#
+		</isNotEmpty>
+		
+		<isNotEmpty property="searchStartSbmtPnttm">
+			AND TO_CHAR(A.SBMT_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStartSbmtPnttm#, '.' , '')
+		</isNotEmpty>
+
+		<isNotEmpty property="searchEndSbmtPnttm">
+			AND TO_CHAR(A.SBMT_PNTTM,'YYYYMMDD') <![CDATA[ <= ]]> REPLACE(#searchEndSbmtPnttm#, '.' , '')
+		</isNotEmpty>
+		<isNotEmpty property="searchStartRegistPnttm">
+			AND TO_CHAR(A.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStartRegistPnttm#, '.' , '')
+		</isNotEmpty>
+
+		<isNotEmpty property="searchEndRegistPnttm">
+			AND TO_CHAR(A.FRST_REGIST_PNTTM,'YYYYMMDD') <![CDATA[ <= ]]> REPLACE(#searchEndRegistPnttm#, '.' , '')
+		</isNotEmpty>
+		<isNotEmpty property="searchStratAprvlPnttm">
+			AND TO_CHAR(A.APRVL_PNTTM, 'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStratAprvlPnttm#, '.' , '')
+		</isNotEmpty>
+
+		<isNotEmpty property="searchEndAprvlPnttm">
+			AND TO_CHAR(A.APRVL_PNTTM, 'YYYYMMDD') <![CDATA[ <= ]]> REPLACE(#searchEndAprvlPnttm#, '.' , '')
+		</isNotEmpty>
+
+		<isNotEmpty property="searchSmbtStartDt">
+			AND TO_CHAR(A.SBMT_PNTTM, 'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchSmbtStartDt#, '.' , '')
+		</isNotEmpty>
+
+		<isNotEmpty property="searchSmbtEndDt">
+			AND TO_CHAR(A.SBMT_PNTTM, 'YYYYMMDD') <![CDATA[ <= ]]> REPLACE(#searchSmbtEndDt#, '.' , '')
+		</isNotEmpty>
+
+		<isNotEmpty property="searchScholDivCd">
+			AND A.SCHOL_DIV_CD = #searchScholDivCd#
+		</isNotEmpty>
+
+		<isEmpty property="searchStartDt">
+			<isEmpty property="searchEndDt">
+				AND 1=1
+			</isEmpty>
+		</isEmpty>
+		
+		<isNotEmpty property="searchEduSlctAreaCd">			
+			AND (
+					
+					(
+						A.EDU_SLCT_AREA_CD = #searchEduSlctAreaCd#						
+						AND 
+						A.EDU_SLCT_CD = '20'
+					)					
+					OR 
+					(
+						'400' = #searchEduSlctAreaCd#
+						AND 
+						A.EDU_SLCT_CD = '10'
+					)
+				)			
+		</isNotEmpty>
+		
+		<isNotEmpty property="searchEduSlctAreaCd2">			
+			AND (
+						A.EDU_SLCT_AREA_CD = #searchEduSlctAreaCd2#						
+					OR 
+						'400' = #searchEduSlctAreaCd2#
+				)			
+		</isNotEmpty>
+
+		<isNotEmpty property="searchEduSlctCd">
+			AND A.EDU_SLCT_CD = #searchEduSlctCd#
+		</isNotEmpty>
+
+		<isNotEmpty property="searchInsttDivCd">
+			AND A.INSTT_DIV_CD = #searchInsttDivCd#
+		</isNotEmpty>
+
+		<isNotEmpty property="userId">
+			AND A.USER_ID = #userId#
+		</isNotEmpty>
+
+		<isNotEmpty property="frstRegisterId">
+			AND A.FRST_REGISTER_ID = #frstRegisterId#
+		</isNotEmpty>
+		<isNotEmpty property="searchScholNm">
+			AND A.SCHOL_INSTT_NM LIKE '%' || #searchScholNm# || '%'
+		</isNotEmpty>
+		<isEmpty property="searchCondition">
+			<isNotEmpty property="searchKeyword">
+				AND (
+					A.SCHOL_INSTT_NM LIKE '%' || #searchKeyword#  '%' OR
+					A.INSTT_NM LIKE '%' || #searchKeyword# || '%'
+				)
+			</isNotEmpty>
+		</isEmpty>
+
+		<isNotEmpty property="searchCondition">
+			<isEqual property="searchCondition" compareValue="1">
+				AND A.SCHOL_INSTT_NM LIKE '%' || #searchKeyword# || '%'
+			</isEqual>
+			<isEqual property="searchCondition" compareValue="2">
+				AND A.CHRG_NM LIKE '%' || #searchKeyword# || '%'
+			</isEqual>
+		</isNotEmpty>
+		
+		<isNotEmpty property="searchChrgNm">
+			AND A.CHRG_NM LIKE '%' || #searchChrgNm# , '%')
+		</isNotEmpty>
+
+		<isNotEmpty property="searchStatusArr">
+			<iterate open="(" close=")" conjunction=","  property="searchStatusArr" prepend="AND A.APRVL_CD IN " >  #searchStatusArr[]#</iterate>
+		</isNotEmpty>
+
+		<isNotEmpty property="searchNotStatusArr">
+			<iterate open="(" close=")" conjunction=","  property="searchNotStatusArr" prepend="AND A.APRVL_CD NOT IN " >  #searchNotStatusArr[]#</iterate>
+		</isNotEmpty>
+
+		<isNotEmpty property="searchScholDivCdArr">
+			<iterate open="(" close=")" conjunction=","  property="searchScholDivCdArr" prepend="AND A.SCHOL_DIV_CD IN " >  #searchScholDivCdArr[]#</iterate>
+		</isNotEmpty>
+
+		<isNotEmpty property="searchStatus">
+			<isEqual property="searchStatus" compareValue="99">
+			AND 
+				(
+						SELECT
+							CNT
+						FROM
+						(	SELECT COUNT(1) AS CNT
+							FROM VE_PRCS_CMPLT_DETAIL 
+							WHERE edu_aplct_ord = A.edu_aplct_ord ) bb
+						WHERE bb.CNT <![CDATA[ > ]]> 0 
+				) > 0
+			</isEqual>
+			<isNotEqual property="searchStatus" compareValue="99">
+			AND 
+				(
+						SELECT
+							CNT
+						FROM
+						(	SELECT COUNT(1) AS CNT
+							FROM VE_PRCS_CMPLT_DETAIL 
+							WHERE edu_aplct_ord = A.edu_aplct_ord ) bb
+						WHERE bb.CNT = 0 
+				) = 0
+			</isNotEqual>
+		</isNotEmpty>
+
+		<isNotEmpty property="searchStateYear">
+			AND TO_CHAR(A.FRST_REGIST_PNTTM, 'YYYY')  = #searchStateYear#
+		</isNotEmpty>
+		
+				
+		<isNotEmpty property="searchStateStatusArr">
+			
+			
+				<iterate  property="searchStateStatusArr" >
+					<isEqual property="searchStateStatusArr[]" compareValue="40">
+					/*	서류제출완료	*/
+					AND					
+					(
+						a.oath_atch_file_id IS NOT NULL
+						OR a.trans_atch_file_id IS NOT null
+						) 
+        
+					</isEqual>					
+				</iterate>
+		</isNotEmpty>
+		
+		<isNotEmpty property="searchChsYn">
+			AND		A.MDFY_RQST_YN = #searchChsYn#
+		</isNotEmpty>
+		
+		<isNotEmpty property="selectPagingListQuery">
+			$selectPagingListQuery$
+		</isNotEmpty>
+		
+		<isNotEmpty property="eduAplctOrd">
+			AND A.EDU_APLCT_ORD = #eduAplctOrd#
+		</isNotEmpty>
+		
+		<isNotEmpty property="searchStatus2">
+		/* 교육콘텐츠 신청 > 수강신청 목록 셀렉트박스 검색자 */
+			
+			
+			<isEqual property="searchStatus2" compareValue="90">
+				AND A.APRVL_CD = '20'
+				AND 
+                 ( SELECT COUNT(*)
+                 FROM    ve_prcs_cmplt_detail a0
+                         INNER JOIN ve_prcs b0
+                         ON      a0.prcs_ord = b0.prcs_ord
+                         INNER JOIN ve_prcs_onln_cntnt c0
+                         ON      c0.prcs_onln_cntnt_ord = a0.prcs_onln_cntnt_ord
+                 WHERE   1                              =1
+                 AND     a0.edu_aplct_ord               =A.EDU_APLCT_ORD
+                 AND     NVL(a0.sbmt_yn,'N')         ='Y'
+                 ) > 0 
+			</isEqual>
+			<isNotEqual property="searchStatus2" compareValue="90">
+				AND A.APRVL_CD = #searchStatus2#
+				AND 0>=
+                 ( SELECT COUNT(*)
+                 FROM    ve_prcs_cmplt_detail a0
+                         INNER JOIN ve_prcs b0
+                         ON      a0.prcs_ord = b0.prcs_ord
+                         INNER JOIN ve_prcs_onln_cntnt c0
+                         ON      c0.prcs_onln_cntnt_ord = a0.prcs_onln_cntnt_ord
+                 WHERE   1                              =1
+                 AND     a0.edu_aplct_ord               =A.EDU_APLCT_ORD
+                 AND     NVL(a0.sbmt_yn,'N')         ='Y'
+                 )				
+			</isNotEqual>			
+			
+		</isNotEmpty>
+		
+		<isNotEmpty property="searchYear">
+		/*저작권 체험교실 년도 검색*/
+			AND TO_CHAR(A.SBMT_PNTTM,'YYYY') = #searchYear#
+		</isNotEmpty>
+		
+		<isNotEmpty property="eduSlctAreaCd">
+		/*저작권 체험교실 지역 검색*/
+			AND A.EDU_SLCT_AREA_CD = #eduSlctAreaCd#
+		</isNotEmpty>
+		
+		<isNotEmpty property="searchCpyAprvlCd">
+		/*저작권 체험교실 상태 검색*/
+			AND A.APRVL_CD = #searchCpyAprvlCd#
+		</isNotEmpty>
+		
+		<isNotEmpty property="searchFullName">
+		/*교육콘텐츠 신청자 검색*/
+			AND (
+			/*
+					A.FULL_NAME like '%' || searchFullName || '%' 
+				OR A.BLNG like concat('%', searchFullName, '%')		
+				*/
+					A.FULL_NAME like '%'||#searchFullName#||'%' 
+				OR A.BLNG like '%'||#searchFullName#||'%'					
+				)
+
+		</isNotEmpty>
+		
+		<isEqual property="searchAdminUpdtYn" compareValue="Y">
+			AND A.ADMIN_UPDT_YN = 'Y'
+		</isEqual>
+			
+		/*
+		ORDER BY 1=1
+		*/
+		ORDER BY 1
+		<isNotEmpty property="orderByQuery">
+			, $orderByQuery$
+		</isNotEmpty>
+		<isNotEqual property="mode" compareValue="EXCEL">
+		/*
+			LIMIT recordCountPerPage OFFSET firstIndex
+			*/
+			OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
+		</isNotEqual>
+	</select>	
 </sqlMap>

src/main/resources/egovframework/sqlmap/ve/lctr/VELctrAreaMng_SQL_Tibero.xml

@@ -683,6 +683,7 @@
 		
 	<!-- 강사 정보 L -->
 	<select id="VELctrAreaMngDAO.selectDateChkList" parameterClass="VELctrDetailVO" resultClass="VELctrDetailVO">
+		/*	VELctrAreaMngDAO.selectDateChkList	*/
 		SELECT 
 			rgstr_strt_dt	AS	rgstrStrtDt
 			, rgstr_end_dt	AS	rgstrEndDt
@@ -702,6 +703,7 @@
 
 	<!-- 강사 정보 L -->
 	<select id="VELctrAreaMngDAO.selectNextDateList" parameterClass="VELctrDetailVO" resultClass="VELctrDetailVO">
+		/*	VELctrAreaMngDAO.selectNextDateList	*/
 		SELECT   rgstr_strt_dt AS rgstrStrtDt
 		        , rgstr_end_dt  AS rgstrEndDt
 		        , TO_CHAR(SYSDATE, 'YYYY.MM.DDHH24')

src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Tibero.xml

@@ -195,7 +195,7 @@
 			
 			
 				
-		ORDER BY 1=1					
+		ORDER BY 1			
 			
 		<isEmpty property="orderByQuery">
 			, a.user_id desc
@@ -204,8 +204,11 @@
 			, $orderByQuery$
 		</isNotEmpty>
 		
-				
+		
-		LIMIT #recordCountPerPage# OFFSET #firstIndex#
+		/*
+		LIMIT recordCountPerPage OFFSET firstIndex
+		*/
+		OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;		
 					
 	</select>			 
 

src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml

@@ -416,5 +416,49 @@
         ORDER BY ccc.code_nm
 		
         	
-	</select>			
+	</select>
+	
+	<!-- 청소년 교육 신청가능일시 확인 하기 -->
+	<select id="VEALctrYrStngMixDAO.selectDateChkList" parameterClass="VEAStngVO" resultClass="VEAStngVO">
+		/*	VEALctrYrStngMixDAO.selectDateChkList	*/
+        SELECT  
+        		 rnds_ord			AS	rndsOrd, 
+        		 rgstr_strt_pnttm AS rgstrStrtPnttm ,
+                 rgstr_ddln_pnttm  AS rgstrDdlnPnttm ,
+                 TO_CHAR(SYSDATE, 'YYYY.MM.DDHH24') ,
+                 TO_CHAR(SYSDATE, 'HH24MI')
+        FROM vea_lctr_rnds_stng
+        WHERE    TO_CHAR(SYSDATE, 'YYYY.MM.DDHH24MI') BETWEEN rgstr_strt_pnttm||'00' AND rgstr_ddln_pnttm||'00'
+        	AND nvl(rgstr_state,'00') <![CDATA[ <> ]]>'03'
+        
+	</select>	
+	
+	<!-- 청소년 교육 신청가능일시 확인 하기(다음 신청일) -->
+	<select id="VEALctrYrStngMixDAO.selectNextDateList" parameterClass="VEAStngVO" resultClass="VEAStngVO">
+		/*	VEALctrYrStngMixDAO.selectNextDateList	*/
+        SELECT   rgstr_strt_pnttm AS rgstrStrtPnttm ,
+                 rgstr_ddln_pnttm  AS rgstrDdlnPnttm ,
+                 TO_CHAR(SYSDATE, 'YYYY.MM.DDHH24') ,
+                 TO_CHAR(SYSDATE, 'HH24MI')
+        FROM vea_lctr_rnds_stng
+        WHERE    rgstr_strt_pnttm||'00' > TO_CHAR(SYSDATE, 'YYYY.MM.DDHH24MI')
+        	AND nvl(rgstr_state,'00') <![CDATA[ <> ]]>'03'
+		ORDER BY rgstr_strt_pnttm ASC
+		LIMIT 1        	
+        		
+	</select>	
+
+	<!-- 청소년 교육 신청가능일시 여부 체크 하기 -->
+	<select id="VEALctrYrStngMixDAO.selectEduAplctDateChkList" parameterClass="VEAStngVO" resultClass="VEAStngVO">
+		/*	VEALctrYrStngMixDAO.selectEduAplctDateChkList	*/
+		SELECT a.rnds_ord AS topLctrPsblPrdOrd
+			,sum(CASE WHEN a.lctr_psbl_yn='Y' THEN 1 ELSE 0 end) AS dpStrtDt
+			,sum(CASE WHEN a.lctr_psbl_yn='N' THEN 1 ELSE 0 END)	AS dpDdlnDt
+		FROM vea_lctr_psbl_prd_stng a
+		WHERE #lctrPsblStrtDt# BETWEEN a.lctr_psbl_strt_dt AND a.lctr_psbl_ddln_dt
+			AND a.rnds_ord=#rndsOrd#
+		GROUP BY 	a.rnds_ord
+        		
+	</select>		
+				
 </sqlMap>

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

@@ -25,9 +25,102 @@
 
 <script type="text/javaScript" language="javascript">
 $( document ).ready(function(){
-	asgnmOnchange();
+	//배정차시계산
+	//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");
+	var phone_arr = phoneReplace.split("-");
+	for(var i=0; i<phoneReplace.split("-").length; i++){
+		$("#phone"+(i+1)).val(phone_arr[i]);
+	};
+	
+	//SSO 이메일 넣어주기
+	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]);
+	};
+	
+	//현재년도
+	var date = new Date();
+	var year = date.getFullYear();
+	
+	//생년월일, 위촉년도 selectbox
+	getYears(year);
+
+	//생년월일 selected 처리
+	var dBirth = "${info.dBirth}"
+	var dBirth1 = dBirth.substring(0,4);
+	var dBirth2 = dBirth.substring(4,6);
+	var dBirth3 = dBirth.substring(6,8);
+	/*
+	생년월일은 8자리(20120812)로 들어가므로 하단은 주석처리함(2023.10-11.)
+	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");
+			}
+	});
+	
+	//위촉년도 selected 처리
+	var apptYr = "${info.apptYr}"
+	
+	$('#apptYr option').each(function(){
+		 if (this.value == apptYr) {
+			 $(this).attr("selected","selected");
+			}
+	});
+	
+	//파일첨부버튼
+    $(".btn_add_file").on('click', function(){
+        $("#photo_file_temp").click();
+    });
 });
 
+//생년월일, 위촉년도 뿌려주기
+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 asgnmOnchange() {
 		var sumAsgnm = 0;
 		$(".asgnm").each(function(idx,ele){
@@ -112,7 +205,56 @@ $( document ).ready(function(){
 			});
 		}
 	}
-	
+
+	//강사 정보 수정
+	function fncLctrModify(){
+
+    	//핸드폰번호 하이푼 추가
+		 var phoneAll = document.getElementById("phone1").value + "-"+ document.getElementById("phone2").value + "-"+ document.getElementById("phone3").value;		 
+   	//핸드폰번호 하이푼 추가 X
+//		 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);	
+		
+		
+		var data1 = new FormData(document.detailForm);
+		
+		if(confirm("강사정보를 수정하시겠습니까?")){
+			$.ajax({
+				type: "POST",
+				url: "${pageContext.request.contextPath}/ve/oprtn/instr/adultVisitEdu/instrInfo/instrMdfyAjax.do",
+				data: data1,
+				dataType:'json',
+				async: false,
+				processData: false,
+				contentType: false,
+				cache: false,
+				success: function (returnData, status) {
+					if(status == 'success'){
+						alert("수정되었습니다.");
+						location.reload();
+					} else if(status== 'fail'){
+						alert("수정에 실패하였습니다.");
+					}
+				},
+				error: function (e) { alert("수정에 실패하였습니다."); console.log("ERROR : ", e); }
+			});
+		}
+	}	
 </script>
 <%-- <form id="pop" name="pop" method="post">
 	<input type="hidden" name="userId" id="userId" value="<c:out value='${info.userId}'/>"/>	<!-- 사용자 아이디 -->
@@ -137,6 +279,12 @@ $( document ).ready(function(){
 	<input type="hidden" name="searchEndDt" value="<c:out value="${vEInstrDetailVO.searchEndDt}" />" />
 	<%-- <input type="hidden" name="searchEduSlctAreaCd" id="searchEduSlctAreaCd" value="<c:out value='${vEInstrDetailVO.searchEduSlctAreaCd}'/>"/>
 	<input type="hidden" name="rsdne" id="rsdne" value="<c:out value='${vEInstrDetailVO.rsdne}'/>"/> --%>
+	
+	<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">
@@ -296,9 +444,235 @@ $( document ).ready(function(){
 					</tbody>
 				</table>
 			</div>
-			<%-- <div id="importDiv">
+			
-				<c:import url="/ve/oprtn/instr/adultVisitEdu/instrInfo/instrLctrStngPopup.do" charEncoding="utf-8"></c:import>
+			
-			</div> --%>
+			
+			<div class="tb_type02">
+				<table>
+					<colgroup>
+						<col style="width: 210px;">
+						<col style="width: auto;">
+						<col style="width: 210px;">
+						<col style="width: auto;">
+					</colgroup>
+					
+					<tbody>
+						<tr>
+							<th scope="row">
+								<p>강사명</p>
+							</th>
+							<td colspan="3" style="position: relative;">
+								<input type="text" name="instrNm" value="<c:out value='${info.instrNm}' />"/>								
+								<div class="put_photo">
+									<div class="put_photo_in">
+			                            <div class="put_photo">
+											<div class="put_photo_in">
+												<div class="put_photo_box">
+													<img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/img_add.png" alt="이미지를 넣어주세요">
+												</div>
+												<!-- <button type="button" class="btnType01" onclick="fncPhotoPopup(); return false;">사진등록</button> -->
+											</div>
+			                            </div>
+									</div>
+								</div>
+							</td>
+						</tr>
+						<tr>
+							<th scope="row">
+								<p>연락처(핸드폰)</p>
+							</th>
+							<td class="input_phone" colspan="3">
+								<label for="phone" class="label">연락처(핸드폰)</label>
+								<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 class="input_mail" colspan="3">
+	                        	<label for="email" class="label">e-mail</label>
+								<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="selType1" 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">
+	                        	<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="btnType01 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">
+								<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="btnType01" data-tooltip="sub26_pop01" onclick="fncRsdnePopup();return false;">선택</button>
+	                            <input type="hidden" name="rsdneId" id="rsdneId" value=""/><!-- 거주지ID -->							
+							</td>
+						</tr>
+						<tr>
+							<th scope="row">
+								<p>생년월일</p>
+							</th>
+							<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">
+							</td>
+						</tr>
+						<!-- 
+						<tr>
+							<th scope="row">
+								<p>최종학교</p>
+							</th>
+							<td>
+	                            <label for="finalSchol" class="label">최종학교</label>
+	                            <input type="text" name="finalSchol" id="finalSchol" size="20" maxLength="20">							
+							</td>
+							<th scope="row">
+								<p>전공</p>
+							</th>
+							<td>
+	                           <label for="mjr" class="label">전공</label>
+	                           <input type="text" name="mjr" id="mjr" size="20" maxlength="20" placeholder=""  value="<c:out value='${info.mjr}'/>">							
+							</td>
+						</tr>
+						 -->
+		                    <tr>
+		                        <th scope="row">		                        	
+		                            <p>소속</p>
+		                        </th>
+		                        <td>
+		                            <label for="finalSchol" class="label">소속</label>
+		                            <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>
+		                            <label for="mjr" class="label">직위</label>
+		                            <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>
+	                            <label for="apptYr" class="label">위촉년도 선택</label>
+	                            <select name="apptYr" id="apptYr" class="sel_type1">
+								</select>							
+							</td>
+							<th scope="row">
+								<p>구분</p>
+							</th>
+							<td>
+	                            <label for="apptDiv" class="label">구분 선택</label>
+	                            /<ve:code codeId="VE0018" code="${info.divCd}"/>/
+								<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)예문
+- SW코딩, 사물인터넷,인공지능,인성, 비젼, 캠프, 인터넷중독, 가족치료, 저작권 개론 등"><c:out value='${info.prfsnFld}'/></textarea>
+							</td>
+						</tr>							
+						<!-- <tr>
+							<th scope="row">
+								<p>위촉구분</p>
+							</th>
+							<td colspan="3">
+	                            <label for="apptYr" class="label">위촉구분 선택</label>
+	                            <ve:select codeId="VE0002" name="apptDiv" id="apptDiv" css="class='sel_type1'" />							
+							</td>
+						</tr>
+						<tr>
+							<th scope="row">
+								<p>활동경력</p>
+							</th>
+							<td colspan="3">
+								<label for="actvtCarer" class="label">활동경력</label>
+								<textarea name="actvtCarer" id="actvtCarer" rows="6" placeholder="예문
+- 한국저작권위원회 저작권청년강사 위촉
+- 국내 초·중·고등학교 및 기관 약 600회 이상 저작권 강의
+- 국내 초·중·고등학교 및 기관 약 600회 이상 저작권 강의
+- 국내 초·중·고등학교 및 기관 약 600회 이상 저작권 강의"></textarea>
+							</td>
+						</tr>
+						<tr>
+							<th scope="row">
+								<p>주요강의내용</p>
+							</th>
+							<td colspan="3">
+								<label for="mnLctrCn" class="label">주요강의내용</label>
+								<textarea name="mnLctrCn" id="mnLctrCn" rows="6" placeholder="예문
+<강의 주제>
+○ 저작권에 대하여 알 수 있다.
+
+<강의 목차>
+1) 저작물에 대한 이해
+2) 저작권에 대한 이해
+3) 저작권 침해 유형"></textarea>
+							</td>
+						</tr>
+						 -->
+					</tbody>
+				</table>
+			</div>			
+			
+			
+			
+<!-- 			<div id="importDiv"> -->
+<%-- 				<c:import url="/ve/oprtn/instr/adultVisitEdu/instrInfo/instrLctrStngPopup.do" charEncoding="utf-8"></c:import> --%>
+<!-- 			</div> -->
 			<%-- <div class="tb_tit01">
 				<p>월별 교육시간 배정 정보</p>
 			</div>
@@ -373,7 +747,9 @@ $( document ).ready(function(){
 					<c:if test="${info.qlfctEndYn ne 'Y'}">
 						<button type="button" class="btn_type02" onclick="fncSave('Y'); return false;">강사해촉</button>
 					</c:if> --%>
+					<button type="button" class="btn_type02" onclick="fncLctrModify(); return false;">정보저장</button>
 					<button type="button" class="btn_type03" onclick="fncGoList(); return false;">목록</button>
+					
 				</div>
 			</div>
 

src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduAplctMngReg.jsp

@@ -419,6 +419,7 @@
 							</p>
 						</td>
 					</tr>
+					<!-- 
 					<tr>
 						<th scope="row">
 							<p>교육내용</p>
@@ -431,6 +432,7 @@
 							</c:forEach>
 						</td>
 					</tr>
+					 -->
 					<tr>
 						<th scope="row">
 							<p>기자재유무</p>
@@ -481,11 +483,13 @@
 						<c:choose>
 							<c:when test="${fn:length(chasiList) ne 0}">
 								<c:forEach var="list" items="${chasiList}" varStatus="status">
+									<input type="hidden" name="eduChasiOrd" id="eduChasiOrd" value="${list.eduChasiOrd}" />
 									<tr>
 										<th>
 											<div class="calendar_wrap">
-												<fmt:parseDate value="${list.eduHopeDt}" var="eduHopeDt" pattern="yyyy.MM.dd"/>
+<%-- 												<fmt:parseDate value="${list.eduHopeDt}" var="eduHopeDt" pattern="yyyy.MM.dd"/> --%>
-												<input type="text" value="<fmt:formatDate value="${eduHopeDt}" pattern="yyyy.MM.dd"/>" name="eduHopeDt"  class="calendar" title="시작일 선택" size="8">
+<%-- 												<input type="text" value="<fmt:formatDate value="${eduHopeDt}" pattern="yyyy.MM.dd"/>" name="eduHopeDt"  class="calendar" title="시작일 선택" size="8"> --%>
+												<input type="text" value="${list.eduHopeDt}" name="eduHopeDt"  class="calendar" title="시작일 선택" size="8">
 											</div>
 										</th>
 										<td>

src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/eduCnfrmMngList.jsp

@@ -853,8 +853,8 @@
 										title="Check" type="checkbox"/>
 								</td>
 								<td>
-									<fmt:parseDate value="${list.eduHopeDt}" var="eduHopeDt" pattern="yyyyMMdd"/>
+									<fmt:parseDate value="${list.eduHopeDt}" var="eduHopeDt" pattern="yyyy.MM.dd"/>
-									<fmt:formatDate value="${eduHopeDt}" pattern="yyyy.MM.dd"/>
+									<fmt:formatDate value="${eduHopeDt}" pattern="yyyy.MM.dd"/>									
 								</td>
 								<td>
 									<fmt:formatDate value="${eduHopeDt}" pattern="E"/>

src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/instrMngList.jsp

@@ -200,10 +200,12 @@
 					<table>
 						<colgroup>
 							<col style="width: 10%;">
-							<col style="width: 9%;">
+							<col style="width: 6%;">
-							<col style="width: 16%">
+							<col style="width: 6%">
 							<col style="width: auto;">
-							<col style="width: 12%;">
+							<col style="width: 10%;">
+							<col style="width: 10%;">
+							<col style="width: 15%;">
 							<col style="width: 12%;">
 							<col style="width: 8%;">
 							<col style="width: 12%;">
@@ -216,6 +218,7 @@
 							<th scope="col">거주지</th>
 							<th scope="col">강의 가능지역</th>
 							<th scope="col">연락처</th>
+							<th scope="col">이메일</th>
 							<th scope="col">주 5일여부</th>
 							<th scope="col">자격 종료 여부</th>
 							<th scope="col">정보변경</th>
@@ -254,6 +257,9 @@
 								<td>
 									<c:out value="${list.phone}"/>
 								</td>
+								<td>
+									<c:out value="${list.email}"/>
+								</td>
 								<td>
 									주${list.monLctrYn + list.tueLctrYn + list.wedLctrYn + list.thuLctrYn + list.friLctrYn}일
 								</td>
@@ -276,7 +282,7 @@
 							</tr>
 						</c:forEach>
 						<c:if test="${empty resultList}">
-							<tr><td colspan="9"><spring:message code="common.nodata.msg" /></td></tr>
+							<tr><td colspan="10"><spring:message code="common.nodata.msg" /></td></tr>
 						</c:if>
 						</tbody>
 					</table>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp

@@ -122,7 +122,9 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 		if(psblFlag == 'N') {
 			//$("select[name=divCd] option[value='10']").remove();
 		}
-		
+
+		//기존 구분값 선택 부분 제외(학생, 선생님, 학부모)
+		$("select[name=divCd] option[value='10']").remove();
 		$("select[name=divCd] option[value='20']").remove();
 		$("select[name=divCd] option[value='30']").remove();
 	});
@@ -476,6 +478,9 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 	// 신청하는 차시가 유효한 신청기간인지, 강의가능시간인지 체크하는 로직
 	// =>강의 가능 시간 여부만 체크로 변경 2022-02-28
 	// 추가로, 본인이 등록했던 신청건인지 체크(사용자아이디, 학교명, 교육희망일, 교육대상 비교)
+	//1.교육희망일이 신청 가능한 일자인지
+	//2.신청 시간이 해당 지역의 가능한 시간인지
+	//3.중복시간 체크
 	function checkAplctPsbl() {
 		var trObj = $('.addClassRow').find('tbody > tr').not('.calendar_wrap tr');
 		
@@ -494,6 +499,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 			var endTm = 	$(this).find('input[name=endTm]').val();
 			var eduSlctAreaCd = $("select[name=eduSlctAreaCd]").val();
 			var trgt = 	$(this).find('input[name=trgt]').val();
+			var rndsOrd = 	$('input[name=rndsOrd]').val();
 			
 			/*
 			if (eduSlctCd=='10'){
@@ -530,15 +536,25 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 				//	"prdDivCd" : prdDivCd,
 					"eduSlctCd" : eduSlctCd,
 					"trgt" : trgt,
+					"rndsOrd":rndsOrd,
 				},
 				dataType:'json',
 				async: false,
 				success:function(returnData){
-					if(returnData.result == "fail"){
+					if(returnData.result == "fail4"){
+						alert("로그인 후 다시 교육신청해 주세요.");
+						flag = false;
+						return;
+					}else if(returnData.result == "fail3"){
+						alert("가능한 교육희망일자가 아닙니다.");
+						flag = false;
+						return;						
+					}else if(returnData.result == "fail"){
 						alert("신청한 차시 중 신청기간, 강의가능시간이 아닌 교육이 있습니다.");
 						flag = false;
 						return;
 					}
+					
 					if(!duplChk) {
 						if(returnData.result == "fail2"){
 							if(confirm("중복된 신청 건이 있습니다. 진행하시겠습니까?")){
@@ -585,6 +601,8 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 					//location.href="<c:url value='/web/main/mainPage.do'/>"
 					
 					psblFlag = 'N';
+				}else{
+					$("input[name=rndsOrd]").val(returnData.rndsOrd);
 				}
 			},
 			error:function(request , status, error){
@@ -719,16 +737,20 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 	function itemChg(item){
 		var eduSlctAreaCd = $("#eduSlctAreaCd");
 		var areaMent = $(".areaMent");
+		var onlineMent = $(".onlineMent");
+		
 		//온라인
 		if(item == '10'){
 			eduSlctAreaCd.hide();
 			areaMent.hide();
+			onlineMent.show();
 			
 		}
 		//오프라인
 		if(item == '20'){
 			eduSlctAreaCd.show();
 			areaMent.show();
+			onlineMent.hide();
 		}
 	}
 
@@ -747,6 +769,8 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 	<input type="hidden" name="limitcount" id="limitcount" value="1" /><!-- 최대 업로드 파일갯수 -->
 	<input type="hidden" name="eduAplctOrd" id="eduAplctOrd" value="${info.eduAplctOrd}" />
 	<input type="hidden" name="mode" id="mode" value="${modelVO.mode}" />
+	<input type="hidden" name="rndsOrd" id="rndsOrd" value="" />
+	
 
 
 	<div class="cont_tit">
@@ -798,6 +822,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 					<label for="eduSlctAreaCd" class="label">지역 선택</label>
 					<ve:select codeId="VE0008" selectedValue="${info.eduSlctAreaCd}" id="eduSlctAreaCd" name="eduSlctAreaCd" styleClass="selType1" css="disabled" defaultText="지역" defaultValue=""/>
 					 <span class="cf_text areaMent" style="color:grey;">학교를 선택하시면 지역은 자동으로 입력됩니다.</span>
+					 <span class="cf_text onlineMent" style="color:grey;">강사님이 방문하지 않는 비대면 교육입니다.</span>
 				</td>
 			</tr>
 			<tr>
@@ -827,10 +852,10 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 					<p>도서벽지학교여부</p>
 				</th>
 				<td>
-					<input type="radio" name="isltnScholYn" id="isltn_schol_N" value="N"  ${empty info.isltnScholYn or info.isltnScholYn eq 'N' ? 'checked' : info.isltnScholYn}>
+					<input type="radio" name="isltnScholYn" id="isltn_schol_Y" value="Y" ${info.isltnScholYn eq 'Y' ? 'checked' : info.isltnScholYn} disabled>
+					<label for="isltn_schol_Y">예</label>				
+					<input type="radio" name="isltnScholYn" id="isltn_schol_N" value="N"  ${empty info.isltnScholYn or info.isltnScholYn eq 'N' ? 'checked' : info.isltnScholYn} disabled>
 					<label for="isltn_schol_N">아니오</label>
-					<input type="radio" name="isltnScholYn" id="isltn_schol_Y" value="Y" ${info.isltnScholYn eq 'Y' ? 'checked' : info.isltnScholYn}>
-					<label for="isltn_schol_Y">예</label>
 				</td>
 			</tr>
 			<tr class="input_adress">
@@ -923,6 +948,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 					<input type="checkbox" name="broadroomEdu" id="broadroomEdu" value="Y" <c:if test="${info.broadroomEdu eq 'Y'}">checked</c:if>> <label for="broadroomEdu">방송실교육</label>
 				</td>
 			</tr>
+			<!-- 
 			<tr>
 				<th scope="row">
 					<p>교육내용</p>
@@ -935,6 +961,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 					</c:forEach>
 				</td>
 			</tr>
+			 -->
 			<tr>
 				<th scope="row">
 					<p>기자재유무</p>
@@ -950,7 +977,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 	<div class="tb_tit01">
 		<div class="tb_tit01_left" style="display: block;">
 			<p>교육차시 정보</p>
-			<span class="cf_text2" style="display:block; padding-left:0; padding-top: 6px;">※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 대상별 3줄 작성)</span>
+			<span class="cf_text2" style="display:block; padding-left:0; padding-top: 6px;">※ 교육추가 버튼을누러 대상별 1줄씩 작성(1줄 = 강사 1인) 바랍니다. (예시 : 3개 학급 신청 시 1학급 당 1줄씩 총 3줄을 작성)</span>
 		</div>
 		<div class="btn_wrap">
 			<button type="button" class="btnType05" title="교육차시 입력테이블 추가생성" onclick="addEduClassCopyTngr('addClassRow')">교육추가</button>
@@ -970,7 +997,7 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 			<tr>
 				<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>교육희망일</th>
 				<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>시간</th>
-				<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>구분</th>
+				<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>점심시간 포함여부</th>
 				<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>대상<br/><span style="font-size:12px;">ex) 1-5반 또는 전교생</span></th>
 				<th scope="col"><p class="req_text"><span>필수입력 항목</span>*</p>인원</th>
 				<th scope="col">삭제</th>
@@ -1117,9 +1144,16 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 									</div>(<input type="text" readonly="readonly" value="${list.lrnTm}" class="input_time" name="lrnTm">분)
 								</div>
 							</td>
+							<!-- 구분을 점심시간 포험여부로 수정 2023.10.11 -->
+							 
 							<td>
 								<ve:select codeId="VE0010" name="divCd" selectedValue="${list.divCd}" styleClass="selType1"/>
 							</td>
+							<!-- 
+							<td>
+								<input type="checkbox" name="divCd" id="divCd" value="40" <c:if test="${info.divCd eq '40'}">checked</c:if>> <label for="corpsEdu">중식시간 포함</label>
+							</td>							 
+							 -->
 							<td><input type="text" style="width: 75%;" name="trgt" value="${list.trgt}"></td>
 							<td><input type="text" style="width: 63%;" name="prsnl" value="${list.prsnl}" maxlength="3" onkeyup="onlyNumber(this);"><p class="input_text">명</p></td>
 							<td><button type="button" class="table_del" onclick="tableDel(this)"><img src="${pageContext.request.contextPath}/visitEdu/usr/publish/images/content/del_btn.png"></button></td>
@@ -1256,10 +1290,17 @@ var psblFlag = "Y";//학생 신청가능기간여부 체크
 									</div>(<input type="text" readonly="readonly" class="input_time" name="lrnTm" title="교육 시간">분)
 								</div>
 							</td>
+							 
 							<td>
 								<label for="sel1" class="label">학생/선생님 선택</label>
 								<ve:select codeId="VE0010" name="divCd" id="sel1" styleClass="selType1"/>
 							</td>
+							<!-- 							
+							<td>
+								<input type="checkbox" name="divCd" id="divCd" value="40" <c:if test="${info.divCd eq '40'}">checked</c:if>> <label for="corpsEdu">중식시간 포함</label>
+							</td>
+							 -->							
+							
 							<td>
 								<label for="target" class="label">대상 입력</label>
 								<input type="text" id="target" name="trgt">

src/main/webapp/WEB-INF/jsp/web/ve/comm/searchBeforeContentPopup.jsp

@@ -135,9 +135,8 @@
                                         </c:when>
                                         <c:otherwise>
                                             <c:choose>
-                                                <c:when test="${not empty list.eduHopeDt}">
+                                                <c:when test="${not empty list.frstRegistPnttm}">
-                                                    <fmt:parseDate value="${list.eduHopeDt}" var="eduHopeDt" pattern="yyyyMMdd"/>
+                                                	${list.frstRegistPnttm}
-                                                    <fmt:formatDate value="${eduHopeDt}" pattern="yyyy.MM.dd"/>
                                                 </c:when>
                                                 <c:otherwise>
                                                     -

src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/instrInfo/instrDashboard.jsp

@@ -69,8 +69,8 @@
 			<div class="tb_tit01_left">
 			</div>
 			<div class="btn_wrap">
-						<fmt:parseDate value="${vELctrDetailVO.rsrchEndDt}" var="rsrchEndDt" pattern="yyyyMMdd"/>			
+
-				마감기간 : <fmt:formatDate value="${rsrchEndDt}" pattern="yyyy-MM-dd"/>
+				마감기간 : ${vELctrDetailVO.rsrchEndDt}
 				<button type="button" class="btnType05" onclick="fncGoLctrRsrchMng('${vELctrDetailVO.rsrchInstrDiv}','${vELctrDetailVO.stngYrMnt}');">강의조사등록</button>
 			</div>
 		</div>

src/main/webapp/WEB-INF/jsp/web/ve/instr/tngrVisitEdu/lctrInfo/lctrStngReg.jsp

@@ -483,12 +483,14 @@
 				</div>
 				<div class="btn_center">
 					<!-- <button type="button" class="btnType04">변경요청</button> -->
-					<c:if test="${not empty vELctrRsrchDetailVO}">
+					<c:if test="${not empty vELctrRsrchDetailVO}"><!-- 기간이면 제출가능 -->
+					
+						<button type="button" class="btnType04" onclick="fncSave('20');">제출</button>
 						
-						<c:if test="${empty vELctrDetailVOSbmt or (not empty vELctrDetailVOSbmt and lctrStngInfo.sbmtYn ne 'Y')}">
+<%-- 						<c:if test="${empty vELctrDetailVOSbmt or (not empty vELctrDetailVOSbmt and lctrStngInfo.sbmtYn ne 'Y')}"> --%>
-							<button type="button" class="btnType04" onclick="fncSave('20');">제출</button>
+<!-- 							<button type="button" class="btnType04" onclick="fncSave('20');">제출</button> -->
 <!-- 							<button type="button" class="btnType03" onclick="fncSave('Y');">저장</button> -->
-						</c:if>
+<%-- 						</c:if> --%>
 					</c:if>
 					<!-- 
 									<br/><br/>테스트용으로 항시 노출됨: