2023-10-10 15:28 강의조사 내용 수정

2023-10-10 15:29:07 +09:00 · 2023-10-10 15:29:07 +09:00 · 54048455a8
commit 54048455a8
parent 7f17f14254
19 changed files with 1286 additions and 89 deletions
--- a/src/main/java/kcc/com/cmm/util/DateUtil.java
+++ b/src/main/java/kcc/com/cmm/util/DateUtil.java
@ -222,4 +222,10 @@ public final class DateUtil {
 		LocalDate date = LocalDate.parse(p_date, formatter);
 		return date;
 	}
+	
+	public static LocalDate getStringToLocalDateDot(String p_date) {
+		DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd");
+		LocalDate date = LocalDate.parse(p_date, formatter);
+		return date;
+	}
 }
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/web/InstrPrflController.java
@ -278,7 +278,8 @@ 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(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 = vELctrRsrchMngService.selectDetailWithQuery(vELctrDetailVO);
        model.addAttribute("vELctrDetailVO", vELctrDetailVO);
        
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/web/lctrTngrInfoStngController.java
@ -154,7 +154,8 @@ 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(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 	"
        		+ "	AND rsrch_instr_div='"+vELctrDetailVO.getRsrchInstrDiv()+"'	"
   				+ "	AND stng_yr_mnt='"+vELctrDetailVO.getStngYrMnt()+"'	");
        //vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetail(vELctrDetailVO);
@ -333,7 +334,8 @@ 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(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 	"
        		+ "	AND rsrch_instr_div='"+vELctrDetailVO.getRsrchInstrDiv()+"'	"
   				+ "	AND stng_yr_mnt='"+vELctrDetailVO.getStngYrMnt()+"'	");
        //vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetail(vELctrDetailVO);
--- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java
+++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/instrInfo/web/OprtnInstrTngrPrflContoller.java
@ -1735,8 +1735,8 @@ public class OprtnInstrTngrPrflContoller {
 	    	t_vEInstrDetailVO.setAprvlCd(vEInstrDetailVO.getAprvlCd());
 	    	t_vEInstrDetailVO.setFirstIndex(0);
 	    	
-	    	List<VELctrDetailVO> selectAsgnmInfoT2List = 	    	vEInstrMixService.selectAsgnmInfoT2(t_vEInstrDetailVO);
-	    	model.addAttribute("asgnmInfoT2List",selectAsgnmInfoT2List);
+	    	//List<VELctrDetailVO> selectAsgnmInfoT2List = 	    	vEInstrMixService.selectAsgnmInfoT2(t_vEInstrDetailVO);
+	    	//model.addAttribute("asgnmInfoT2List",selectAsgnmInfoT2List);
 	    	
 			return "/oprtn/tngrVisitEdu/instrMngDetail";
 		}		
@ -1800,7 +1800,8 @@ 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(SYSDATETIME,'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);
@ -1953,7 +1954,8 @@ 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(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 	"
 	        		+ "	AND rsrch_instr_div='"+vELctrDetailVO.getRsrchInstrDiv()+"'	"
 	   				+ "	AND stng_yr_mnt='"+vELctrDetailVO.getStngYrMnt()+"'	");
 	        //vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetail(vELctrDetailVO);
--- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/AdvOprtnLctrRsrchTngrContoller.java
+++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/AdvOprtnLctrRsrchTngrContoller.java
@ -0,0 +1,234 @@
+package kcc.ve.oprtn.instr.tngrVisitEdu.lctrRsrch.web;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import egovframework.rte.fdl.idgnr.EgovIdGnrService;
+import kcc.com.cmm.EgovMessageSource;
+import kcc.com.cmm.LoginVO;
+import kcc.com.cmm.service.EgovCmmUseService;
+import kcc.com.cmm.service.EgovFileMngService;
+import kcc.com.cmm.service.EgovFileMngUtil;
+import kcc.com.utl.user.service.CheckAdrProcessUtil;
+import kcc.com.utl.user.service.CheckFileUtil;
+import kcc.com.utl.user.service.CheckLoginUtil;
+import kcc.kccadr.accdnt.acd.service.AdjstChangeDateService;
+import kcc.kccadr.adjPgrMgr.cclt.service.ConciliatorManageService;
+import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService;
+import kcc.let.utl.fcc.service.EgovCryptoUtil;
+import kcc.let.utl.fcc.service.EgovCryptoUtil4VO;
+import kcc.let.utl.fcc.service.VEPagingUtil;
+import kcc.ve.adv.tngr.stngInfo.service.VEAStngService;
+import kcc.ve.adv.tngr.stngInfo.service.VEAStngVO;
+import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailService;
+import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrMixService;
+import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrService;
+import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrAreaService;
+import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrDetailVO;
+import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrMIXService;
+import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrPrfrnService;
+import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrRsrchMngService;
+import kcc.ve.instr.tngrVisitEdu.lctrInfo.service.VELctrStngService;
+import kcc.ve.instr.tngrVisitEdu.rsdncInfo.service.VERsdncMIXService;
+
+/**
+ * OprtnLctrRsrchTngrContoller.java
+ * 청소년 강의 조사 관리
+ * 강의 조사 관리 controller 클래스를 정의한다.
+ * @author 이지우
+ * @since 2021.12.07
+ * @version 1.0
+ * @see
+ *
+ * <pre>
+ * << 개정이력(Modification Information) >>
+ *
+ *   수정일      수정자           수정내용
+ *  -------    --------    ---------------------------
+ *   2021.12.23  이지우          최초 생성
+ *
+ * </pre>
+ */
+
+@Controller
+public class AdvOprtnLctrRsrchTngrContoller {
+	
+	private static final Logger LOGGER = LoggerFactory.getLogger(AdvOprtnLctrRsrchTngrContoller.class);
+	
+    @Resource(name = "conciliatorManageService")
+    private ConciliatorManageService conciliatorManageService;
+    
+	// eGov 공통 메세지
+		@Resource(name = "egovMessageSource")
+		EgovMessageSource egovMessageSource;
+		
+		//로그인 체크 util
+		@Resource(name = "checkLoginUtil")
+		private CheckLoginUtil checkLoginUtil;
+		
+	    //파일 체크 util
+		@Resource(name = "checkFileUtil")
+		private CheckFileUtil checkFileUtil;
+		
+		//암복호화 유틸
+		@Resource(name = "egovCryptoUtil")
+		EgovCryptoUtil egovCryptoUtil;
+		
+		//파일정보의 관리
+		@Resource(name = "EgovFileMngService")
+		private EgovFileMngService fileService;
+		
+		//파일 처리 egov
+	    @Resource(name="EgovFileMngUtil")
+		private EgovFileMngUtil egovFileMngUtil;
+	    
+		//파일 처리 egov
+		@Resource(name = "EgovFileMngService")
+		private EgovFileMngService fileMngService;
+		
+		
+		@Resource(name="adjstChangeDateService")
+		private AdjstChangeDateService adjstChangeDateService;
+		
+		@Resource(name="KccadrMgrUdtService")
+		private KccadrMgrUdtService kccadrMgrUdtService;
+		
+		// 교육신청 서비스단
+		@Resource(name = "checkAdrProcessUtil")
+		private CheckAdrProcessUtil checkAdrProcessUtil;
+		
+		//강사 정보
+		@Resource(name="vEInstrService")
+		private VEInstrService vEInstrService;
+
+		//강사상세 정보
+		@Resource(name="vEInstrDetailService")
+		private VEInstrDetailService vEInstrDetailService;
+		
+		//강사MIX 정보
+		@Resource(name="vEInstrMixService")
+		private VEInstrMixService vEInstrMixService;
+
+		//강의설정
+		@Resource(name = "vELctrStngService")
+		private VELctrStngService vELctrStngService;
+		
+		//강의설정 MIX
+		@Resource(name = "vELctrMIXService")
+		private VELctrMIXService vELctrMIXService;
+		
+		//강의지역 
+		@Resource(name = "vELctrAreaService")
+		private VELctrAreaService vELctrAreaService;
+		
+		//강의지역 MIX
+		@Resource(name = "vERsdncMIXService")
+		private VERsdncMIXService vERsdncMIXService;		
+		
+		//강의선호
+		@Resource(name = "vELctrPrfrnService")
+		private VELctrPrfrnService vELctrPrfrnService;		
+		
+		//VO 암/복호화
+		@Resource(name="egovCryptoUtil4VO")
+		private EgovCryptoUtil4VO egovCryptoUtil4VO;
+		
+		// eGov 공통코드
+		@Resource(name = "EgovCmmUseService")
+		private EgovCmmUseService cmmUseService;
+		
+		//강의설정 ID
+	    @Resource(name = "lctrStngGnrService")
+	    private EgovIdGnrService lctrStngGnrService;
+	    
+		//강의지역 ID
+	    @Resource(name = "lctrAreaGnrService")
+	    private EgovIdGnrService lctrAreaGnrService;
+	    
+		//강의선호 ID
+	    @Resource(name = "prfrnTrgtGnrService")
+	    private EgovIdGnrService prfrnTrgtGnrService;
+	    
+	    //강사신청 임의 ID
+	    @Resource(name = "instrTempGnrService")
+	    private EgovIdGnrService instrTempGnrService;
+	    
+		// 페이지 유틸
+		@Resource(name = "vEPagingUtil")
+		private VEPagingUtil vEPagingUtil;
+
+		// 강의 조사
+		@Resource(name = "vELctrRsrchMngService")
+		private VELctrRsrchMngService vELctrRsrchMngService;
+		
+		//강의설정 관리
+		@Resource(name = "vEAStngService")
+		private VEAStngService vEAStngService;
+		
+		/**
+		 * 강의조사관리 기간 설정 팝업
+		 */
+		@RequestMapping("/kccadr/oprtn/tngrVisitEdu/popup/advLctrRsrchStngMngPopup.do")	
+		public String advRndsStngMngPopup(
+				@ModelAttribute("vEAStngVO") VEAStngVO vEAStngVO
+				, @ModelAttribute("vELctrDetailVO") VELctrDetailVO vELctrDetailVO
+				, ModelMap model
+				, HttpServletRequest request
+				) throws Exception {
+
+			//로그인 처리====================================
+			//로그인 정보 가져오기
+			
+			//String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request);
+			//if (!"".equals(s_userCheckNInfo))	return s_userCheckNInfo;		
+	        
+			//로그인 처리====================================
+
+			
+			try {
+		        LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기	        
+		        vEAStngVO.setFrstRegisterId(loginVO.getUniqId());
+		        
+		        //등록된 해당 년도의 회차리스트 정보 가져오기
+		    	List<VEAStngVO>	selectBasicList	=	vEAStngService.selectList_VEALRS(vEAStngVO);
+		    	
+		    	model.addAttribute("selectBasicList", selectBasicList);
+		    		    		        
+		    	
+		    	//년도 정보
+		    	//VELctrDetailVO vELctrDetailVO = new VELctrDetailVO();
+				List<VELctrDetailVO> selectStngYrList = vELctrMIXService.selectStngYrList(vELctrDetailVO);
+				model.addAttribute("selectStngYrList", selectStngYrList);
+				
+				//월 정보
+				List<VELctrDetailVO> selectStngMntList = vELctrMIXService.selectStngMntList(vELctrDetailVO);
+				model.addAttribute("selectStngMntList", selectStngMntList);
+				
+				//선택된 조사기간 정보
+				//vELctrDetailVO.setStngYrMnt(stngYrMnt);
+				List<VELctrDetailVO> selectVELctrDetailVOList = vELctrRsrchMngService.selectList(vELctrDetailVO);
+				//List<VELctrDetailVO> selectVELctrDetailVOList = vELctrRsrchMngService.selectPagingList(vELctrDetailVO);
+				
+				if (selectVELctrDetailVOList.size()>0) {
+					model.addAttribute("selectVELctrDetailVO", selectVELctrDetailVOList.get(0));	
+				}				
+		        
+			}catch(Exception ex)
+			{
+				ex.printStackTrace();
+			}
+			    	
+			
+			return "oprtn/tngrVisitEdu/popup/advLctrRsrchStngMngPopup";		
+		}	
+				
+}
--- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java
+++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java
@ -17,8 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;

-import com.ctc.wstx.util.DataUtil;
-
 import egovframework.rte.fdl.idgnr.EgovIdGnrService;
 import egovframework.rte.ptl.mvc.tags.ui.pagination.PaginationInfo;
 import kcc.com.cmm.EgovMessageSource;
@ -219,15 +217,22 @@ public class OprtnLctrRsrchTngrContoller {
 					// 참여현황 참여 카운트
 					t.setLctrStngOrdSbmt(Long.toString(lctrStngOrdList.stream().filter(s -> StringUtils.isNotEmpty(s)).count()));
 					
-					LocalDate startDate = DateUtil.getStringToLocalDate(t.getRsrchStrtDt());
-					LocalDate endDate = DateUtil.getStringToLocalDate(t.getRsrchEndDt());
+					LocalDate startDate = DateUtil.getStringToLocalDateDot(t.getRsrchStrtDt());
+					LocalDate endDate = DateUtil.getStringToLocalDateDot(t.getRsrchEndDt());
 					
 					// 진행중 체크
 					// 공통 코드 추가 VE0034 01 : 진행전, 02 : 진행중, 03 : 마감 
-					if(nowDate.isEqual(startDate) || nowDate.isEqual(endDate)) {t.setRsrchState("02");}
-					else if(nowDate.isBefore(startDate)) {t.setRsrchState("01");}
-					else if(nowDate.isAfter(endDate)) {t.setRsrchState("03");}
 					
+					System.out.println("t.getRsrchState()");
+					System.out.println(t.getRsrchState());
+					System.out.println(t.getRsrchState());
+					
+					if ("".equals(t.getRsrchState()) || t.getRsrchState() ==null) {
+						if(nowDate.isEqual(startDate) || nowDate.isEqual(endDate)) {t.setRsrchState("02");}
+						else if(nowDate.isBefore(startDate)) {t.setRsrchState("01");}
+						else if(nowDate.isAfter(endDate)) {t.setRsrchState("03");}						
+					}
+										
 				} catch (Exception e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@ -279,12 +284,13 @@ public class OprtnLctrRsrchTngrContoller {
 			//로그인 정보 가져오기
 	        LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기

+	        
 	        System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1");
 	        System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"+vELctrDetailVO.getStngYrMnt());
 	        System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"+vELctrDetailVO.getRsrchStrtDt());
 	        System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1");
 	        
-	        
+	        /*
 			vELctrDetailVO.setStngYrMnt(vELctrDetailVO.getStngYrMnt().replaceAll("[.]", ""));
 			System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa2");
 			try {
@ -298,6 +304,7 @@ public class OprtnLctrRsrchTngrContoller {
 			}catch(Exception ex) {
 				ex.printStackTrace();
 			}
+			*/
 	        
 			System.out.println("aaaaaaaaaaaaaaaaaaaaaaaa3a");
 			
@ -309,9 +316,12 @@ public class OprtnLctrRsrchTngrContoller {
 			if (selectDupDateCount.getTotCnt()<=0) {
 		        //저장
 		        vELctrDetailVO.setFrstRegisterId(loginVO.getUniqId());
-		        vELctrRsrchMngService.insert(vELctrDetailVO);
+		        int i_ret	=	vELctrRsrchMngService.update(vELctrDetailVO);
 		        
-				modelAndView.addObject("result", "success");				
+		        if (i_ret>0)	modelAndView.addObject("result", "success");
+		        else modelAndView.addObject("result", "fail");
+		        
+								
 			}else {
 				modelAndView.addObject("result", "already");
 			}
@ -391,5 +401,86 @@ public class OprtnLctrRsrchTngrContoller {
 			
 			return "/oprtn/tngrVisitEdu/lctrRsrchMngDetail";
 		}
+
+		/**
+		 * 강의조사 요청목록 등록Ajax - 
+		 */
+		@RequestMapping("lctrRsrchMngDelAjax.do")	
+		public ModelAndView lctrRsrchMngDelAjax( 
+				@ModelAttribute("vELctrDetailVO") VELctrDetailVO vELctrDetailVO
+				
+				, ModelMap model
+				, RedirectAttributes redirectAttributes
+				, HttpSession session
+				, HttpServletRequest request
+				) throws Exception {
+					
+			ModelAndView modelAndView = new ModelAndView();
+			modelAndView.setViewName("jsonView");	  
+			//로그인 처리====================================
+			//로그인 정보 가져오기
+	        LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+
+	        
+	        System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1");
+	        System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"+vELctrDetailVO.getStngYrMnt());
+	        System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"+vELctrDetailVO.getRsrchStrtDt());
+	        System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1");
+	        
+	        //저장
+	        vELctrDetailVO.setFrstRegisterId(loginVO.getUniqId());
+	        int i_ret	=	vELctrRsrchMngService.delete(vELctrDetailVO);
+	        
+	        if (i_ret>0)	modelAndView.addObject("result", "success");
+	        else modelAndView.addObject("result", "fail");
+			
+
+			
+			return modelAndView;
+		}
 		
+		/**
+		 * 강의조사 요청목록 상태변경Ajax - 
+		 */
+		@RequestMapping("lctrRsrchMngChangeAjax.do")	
+		public ModelAndView lctrRsrchMngChangeAjax( 
+				@ModelAttribute("vELctrDetailVO") VELctrDetailVO vELctrDetailVO
+				
+				, ModelMap model
+				, RedirectAttributes redirectAttributes
+				, HttpSession session
+				, HttpServletRequest request
+				) throws Exception {
+					
+			ModelAndView modelAndView = new ModelAndView();
+			modelAndView.setViewName("jsonView");	  
+			//로그인 처리====================================
+			//로그인 정보 가져오기
+	        LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+
+	        
+	        System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1");
+	        System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"+vELctrDetailVO.getStngYrMnt());
+	        System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1"+vELctrDetailVO.getRsrchStrtDt());
+	        System.out.println("aaaaaaaaaaaaaaaaaaaaaaaaa1");
+	        
+	        //저장
+	        vELctrDetailVO.setFrstRegisterId(loginVO.getUniqId());
+	        
+	        if ("03".equals(vELctrDetailVO.getRsrchState())) {
+	        	vELctrDetailVO.setRsrchState("00");//00-rest, 01-진행전,02-진행중,03-마감	
+	        }else {
+	        	vELctrDetailVO.setRsrchState("03");//00-rest, 01-진행전,02-진행중,03-마감
+	        }
+	        
+	        
+	        int i_ret	=	vELctrRsrchMngService.update(vELctrDetailVO);
+	        
+	        if (i_ret>0)	modelAndView.addObject("result", "success");
+	        else modelAndView.addObject("result", "fail");
+			
+
+			
+			return modelAndView;
+		}			
 }
--- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEEduPnlty_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEEduPnlty_SQL_Tibero.xml
@ -26,7 +26,7 @@
 		a.edu_aplct_ord			AS	eduAplctOrd,
 		a.edu_chasi_ord			AS	eduChasiOrd,
 		a.pnlty_cd				AS	pnltyCd,
-		DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d')  AS frstRegistPnttm,
+		TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD')  AS frstRegistPnttm,
 		a.frst_register_id		AS frstRegisterId,
 		a.user_id				AS	userId
 	</sql>
@ -63,6 +63,7 @@
 	
 	<!-- 패널티 정보 R -->
 	<select id="VEEduPnltyDAO.selectDetail" parameterClass="VEInstrAsgnmVO" resultClass="VEInstrAsgnmVO">
+		/*	VEEduPnltyDAO.selectDetail	*/
 		SELECT
 			<include refid="VEEduPnltyDAO.select_column_name"/>
 		FROM 
@ -103,10 +104,11 @@

 	<!-- 패널티 정보 L -->
 	<select id="VEEduPnltyDAO.selectList" parameterClass="VEInstrAsgnmVO" resultClass="VEInstrAsgnmVO">
+		/*	VEEduPnltyDAO.selectList	*/
 		SELECT			
 			<include refid="VEEduPnltyDAO.select_column_name"/>
 			,b.schol_instt_nm 	AS	scholInsttNm
-			,DATE_FORMAT(c.edu_hope_dt,'%Y.%m.%d') 		AS	eduHopeDt
+			,TO_CHAR(c.edu_hope_dt,'YYYY.MM.DD') 		AS	eduHopeDt
 			,c.strt_tm 			AS	strtTm
 			,c.end_tm 			AS	endTm
 			,c.lrn_tm 			AS	lrnTm
@ -135,6 +137,7 @@
 		
 	<!-- 패널티 정보 L page -->
 	<select id="VEEduPnltyDAO.selectPagingList" parameterClass="VEInstrAsgnmVO" resultClass="VEInstrAsgnmVO">
+		/*	VEEduPnltyDAO.selectPagingList	*/
 		SELECT
 			COUNT(1) OVER() AS totCnt ,
 			<include refid="VEEduPnltyDAO.select_column_name"/>
@ -157,7 +160,7 @@
 			
 			
 				
-		ORDER BY 1=1					
+		ORDER BY 1				
 			
 		<isEmpty property="orderByQuery">
 			, a.edu_aplct_ord desc
@ -166,8 +169,10 @@
 			, $orderByQuery$
 		</isNotEmpty>
 		
-				
-		LIMIT #recordCountPerPage# OFFSET #firstIndex#
+		/*
+			LIMIT recordCountPerPage OFFSET firstIndex
+			*/
+			OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
 					
 	</select>	
 	
--- a/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/instr/VEInstr_MIX_SQL_Tibero.xml
@ -877,7 +877,12 @@
 		SELECT SUBSTRING(b.edu_hope_dt,1,4)	AS	eduHopeDt
 			, SUM(b.chasi) chasi
 			, d.yr_mxmm_asgnm_tm AS yrMxmmAsgnmTm
-			, IF(d.yr_mxmm_asgnm_tm>0, CAST(CAST(SUM(b.chasi) AS DOUBLE)/d.yr_mxmm_asgnm_tm*100 AS DOUBLE),0) AS wCnt
+			/*
+			, IF(d.yr_mxmm_asgnm_tm>0, CAST(CAST(SUM(b.chasi) AS NUMBER)/d.yr_mxmm_asgnm_tm*100 AS NUMBER),0) AS wCnt
+			*/
+			/*
+			, CASE WHEN d.yr_mxmm_asgnm_tm>0	THEN CAST(CAST(SUM(b.chasi) AS NUMBER)/d.yr_mxmm_asgnm_tm*100 AS NUMBER)	ELSE 0	END AS wCnt
+			*/
 		FROM 
 			ve_lctr_stng d,
 			ve_edu_chasi_instr_asgnm c
@ -896,7 +901,7 @@
 		   	
 		   	<isEmpty property="mngNmbrYr">
 		   		/*	배정 대상 년도를 한정	*/								   		
-		   		AND	SUBSTRING(b.edu_hope_dt,1,4)=DATE_FORMAT(NOW(),'%Y')		   		
+		   		AND	SUBSTRING(b.edu_hope_dt,1,4)=TO_CHAR(SYSDATE,'YYYY')		   		
 		   	</isEmpty>		   		
 						
 			AND d.use_yn='Y'			
@ -907,13 +912,17 @@
 			AND b.edu_chasi_ord=c.edu_chasi_ord
 			
 			AND b.edu_aplct_ord=a.edu_aplct_ord
-			AND IFNULL(a.use_yn,'Y')='Y'
+			AND NVL(a.use_yn,'Y')='Y'
 			/*	청소년	*/
 			AND a.lctr_div_cd='10'
            /* 교육신청이 확정되고, 강사확정인 경우만 통계 제공 */
            AND      a.aprvl_cd       = '60'
            AND      c.asgnm_aprvl_cd = '30'			
 		GROUP BY SUBSTRING(b.edu_hope_dt,1,4)
+			, d.yr_mxmm_asgnm_tm
+			/*
+			, CASE WHEN d.yr_mxmm_asgnm_tm>0	THEN CAST(CAST(SUM(b.chasi) AS NUMBER)/d.yr_mxmm_asgnm_tm*100 AS NUMBER)	ELSE 0	END
+			*/
 		   	
 	</select>	
 	
@ -932,11 +941,15 @@

        		  	 , aaaa.mntSum
        		  	 , aaaa.instrNm
+        		  	 /*
        		  	 , IF(aaaa.userId IS NOT NULL, CONCAT('(',SUBSTRING(aaaa.userId,INSTR(aaaa.userId,'_')+1)*1,')'),'') AS userIdNum
+        		  	 */
+        		  	 , CASE WHEN aaaa.userId IS NOT NULL THEN '('||SUBSTRING(aaaa.userId,INSTR(aaaa.userId,'_')+1)*1||')' ELSE '' AS userIdNum
        		  	 , aaaa.yrMxmmAsgnmTm
        		  	 , ROUND(aaaa.achvPer,2) achvPer
        		  	 , aaaa.totCnt
        		  	 
+        		  	 /*
        		  	 , IF(aaaa.asgnmTm1>0,CONCAT(aaaa.asgnmTm1,'(',IFNULL(bbbb.wCntMnt01,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt01,aaaa.areaCnt),')'),aaaa.asgnmTm1) AS asgnmTm1
        		  	 , IF(aaaa.asgnmTm2>0,CONCAT(aaaa.asgnmTm2,'(',IFNULL(bbbb.wCntMnt02,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt02,aaaa.areaCnt),')'),aaaa.asgnmTm2) AS asgnmTm2
        		  	 , IF(aaaa.asgnmTm3>0,CONCAT(aaaa.asgnmTm3,'(',IFNULL(bbbb.wCntMnt03,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt03,aaaa.areaCnt),')'),aaaa.asgnmTm3) AS asgnmTm3
@ -948,7 +961,22 @@
        		  	 , IF(aaaa.asgnmTm9>0,CONCAT(aaaa.asgnmTm9,'(',IFNULL(bbbb.wCntMnt09,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt09,aaaa.areaCnt),')'),aaaa.asgnmTm9) AS asgnmTm9
        		  	 , IF(aaaa.asgnmTm10>0,CONCAT(aaaa.asgnmTm10,'(',IFNULL(bbbb.wCntMnt10,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt10,aaaa.areaCnt),')'),aaaa.asgnmTm10) AS asgnmTm10
        		  	 , IF(aaaa.asgnmTm11>0,CONCAT(aaaa.asgnmTm11,'(',IFNULL(bbbb.wCntMnt11,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt11,aaaa.areaCnt),')'),aaaa.asgnmTm11) AS asgnmTm11
-        		  	 , IF(aaaa.asgnmTm12>0,CONCAT(aaaa.asgnmTm12,'(',IFNULL(bbbb.wCntMnt12,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt12,aaaa.areaCnt),')'),aaaa.asgnmTm12) AS asgnmTm12        		  	 
+        		  	 , IF(aaaa.asgnmTm12>0,CONCAT(aaaa.asgnmTm12,'(',IFNULL(bbbb.wCntMnt12,aaaa.wCnt),'/',IFNULL(bbbb.areaCnt12,aaaa.areaCnt),')'),aaaa.asgnmTm12) AS asgnmTm12
+        		  	 */        		  	 
+        		  	 
+        		  	 , CASE WHEN aaaa.asgnmTm1>0 THEN aaaa.asgnmTm1||'('||NVL(bbbb.wCntMnt01,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt01,aaaa.areaCnt)||')'	ELSE aaaa.asgnmTm1 END AS asgnmTm1
+        		  	 , CASE WHEN aaaa.asgnmTm2>0 THEN aaaa.asgnmTm2||'('||NVL(bbbb.wCntMnt02,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt02,aaaa.areaCnt)||')'	ELSE aaaa.asgnmTm2 END AS asgnmTm2
+        		  	 , CASE WHEN aaaa.asgnmTm3>0 THEN aaaa.asgnmTm3||'('||NVL(bbbb.wCntMnt03,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt03,aaaa.areaCnt)||')'	ELSE aaaa.asgnmTm3 END AS asgnmTm3
+        		  	 , CASE WHEN aaaa.asgnmTm4>0 THEN aaaa.asgnmTm4||'('||NVL(bbbb.wCntMnt04,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt04,aaaa.areaCnt)||')'	ELSE aaaa.asgnmTm4 END AS asgnmTm4
+        		  	 , CASE WHEN aaaa.asgnmTm5>0 THEN aaaa.asgnmTm5||'('||NVL(bbbb.wCntMnt05,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt05,aaaa.areaCnt)||')'	ELSE aaaa.asgnmTm5 END AS asgnmTm5
+        		  	 , CASE WHEN aaaa.asgnmTm6>0 THEN aaaa.asgnmTm6||'('||NVL(bbbb.wCntMnt06,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt06,aaaa.areaCnt)||')'	ELSE aaaa.asgnmTm6 END AS asgnmTm6
+        		  	 , CASE WHEN aaaa.asgnmTm7>0 THEN aaaa.asgnmTm7||'('||NVL(bbbb.wCntMnt07,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt07,aaaa.areaCnt)||')'	ELSE aaaa.asgnmTm7 END AS asgnmTm7
+        		  	 , CASE WHEN aaaa.asgnmTm8>0 THEN aaaa.asgnmTm8||'('||NVL(bbbb.wCntMnt08,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt08,aaaa.areaCnt)||')'	ELSE aaaa.asgnmTm8 END AS asgnmTm8
+        		  	 , CASE WHEN aaaa.asgnmTm9>0 THEN aaaa.asgnmTm9||'('||NVL(bbbb.wCntMnt09,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt09,aaaa.areaCnt)||')'	ELSE aaaa.asgnmTm9 END AS asgnmTm9
+        		  	 , CASE WHEN aaaa.asgnmTm10>0 THEN aaaa.asgnmTm10||'('||NVL(bbbb.wCntMnt10,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt10,aaaa.areaCnt)||')'	ELSE aaaa.asgnmTm10 END AS asgnmTm10
+        		  	 , CASE WHEN aaaa.asgnmTm11>0 THEN aaaa.asgnmTm11||'('||NVL(bbbb.wCntMnt11,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt11,aaaa.areaCnt)||')'	ELSE aaaa.asgnmTm11 END AS asgnmTm11
+        		  	 , CASE WHEN aaaa.asgnmTm12>0 THEN aaaa.asgnmTm12||'('||NVL(bbbb.wCntMnt12,aaaa.wCnt)||'/'||NVL(bbbb.areaCnt12,aaaa.areaCnt)||')'	ELSE aaaa.asgnmTm12 END AS asgnmTm12
+        		  	 							
        		  	 	
 	
 	FROM (
@ -956,13 +984,25 @@
 			                 , bbb.appt_div AS apptDiv
 			                 , '' lctrAreaNm
 			                 , bbb.rsdne 
+			                 /*
 			                 , IF (ccc.mon_lctr_yn='Y',1,0) + IF (ccc.tue_lctr_yn='Y',1,0) + IF (ccc.wed_lctr_yn='Y',1,0) 
 			                 	+ IF (ccc.thu_lctr_yn='Y',1,0) + IF (ccc.fri_lctr_yn='Y',1,0) AS wCnt
-			                 , IFNULL(ddd.areaCnt,0) AS areaCnt
+			                 	*/
+			                 , CASE WHEN ccc.mon_lctr_yn='Y' THEN 1 ELSE 0 END
+			                 + CASE WHEN ccc.tue_lctr_yn='Y' THEN 1 ELSE 0 END
+			                 + CASE WHEN ccc.wed_lctr_yn='Y' THEN 1 ELSE 0 END
+			                 + CASE WHEN ccc.thu_lctr_yn='Y' THEN 1 ELSE 0 END
+			                 + CASE WHEN ccc.fri_lctr_yn='Y' THEN 1 ELSE 0 END AS wCnt
+			                 
+			                 , NVL(ddd.areaCnt,0) AS areaCnt
 			                 , aaa.*
 			                 , bbb.instr_nm                                                                                                         AS instrNm
 			                 , ccc.yr_mxmm_asgnm_tm                                                                                                 AS yrMxmmAsgnmTm
+			                 /*
 			                 , IF (ccc.yr_mxmm_asgnm_tm=0,0,ROUND(CAST(CAST(aaa.mntSum AS DOUBLE)/ifnull(ccc.yr_mxmm_asgnm_tm,1)*100 AS DOUBLE),1)) AS achvPer
+			                 */
+			                 , CASE WHEN ccc.yr_mxmm_asgnm_tm=0 THEN 0 
+			                 									ELSE ROUND(CAST(CAST(aaa.mntSum AS DOUBLE)/NVL(ccc.yr_mxmm_asgnm_tm,1)*100 AS DOUBLE),1) END AS achvPer
 			                 , COUNT(1) OVER() AS totCnt			                 
 			        FROM     ( SELECT  user_id                               AS userId ,
 			                          CAST(SUM(IF(mnt='01',chasi,0)) AS                                                                                                                                                                                                        INT) AS asgnmTm1 ,
@ -1122,7 +1162,7 @@
 	
 	
 			
-		ORDER BY 1=1
+		ORDER BY 1
 		<isEmpty property="orderByQuery">
 			, aaaa.userId
 		</isEmpty>
@ -1130,7 +1170,10 @@
 			, $orderByQuery$
 		</isNotEmpty>
 		<isNotEqual property="mode" compareValue="EXCEL">
-			LIMIT #recordCountPerPage# OFFSET #firstIndex#
+		/*
+			LIMIT recordCountPerPage OFFSET firstIndex
+			*/
+			OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
 		</isNotEqual>		   	
 	</select>	
 	
--- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrAreaMng_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrAreaMng_SQL_Tibero.xml
@ -741,7 +741,7 @@
 			
 			
 				
-		ORDER BY 1=1					
+		ORDER BY 1					
 			
 		<isEmpty property="orderByQuery">
 			, a.area_cd desc
@ -750,8 +750,10 @@
 			, $orderByQuery$
 		</isNotEmpty>
 		
-				
-		LIMIT #recordCountPerPage# OFFSET #firstIndex#
+		/*
+			LIMIT recordCountPerPage OFFSET firstIndex
+			*/
+			OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
 					
 	</select>			 

--- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrArea_SQL_Tibero.xml
@ -211,7 +211,7 @@

 	<!-- 강사 정보 L page -->
 	<select id="VELctrAreaDAO.selectPagingListNew" parameterClass="VELctrDetailVO" resultClass="VELctrDetailVO">
-	/*	//조사년월에 강사가 선택한 강의지역 리스트로 변경. 2023-07-25	*/
+	/*	//조사년월에 강사가 선택한 강의지역 리스트로 변경. 2023-07-25	VELctrAreaDAO.selectPagingListNew	*/
 		SELECT   COUNT(1) OVER() AS totCnt ,
 		         c.instr_div     AS instrDiv,
 		         c.user_id       AS userId,
--- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Tibero.xml
@ -32,7 +32,9 @@
 	        a.stng_yr_mnt				AS	stngYrMnt,	        
 	        
       		a.rsrch_strt_dt				AS	rsrchStrtDt,
-       		a.rsrch_end_dt				AS	rsrchEndDt,    		       		
+       		a.rsrch_end_dt				AS	rsrchEndDt,
+       		
+       		a.lctr_rsrch_state			AS	rsrchState,    		       		
       		
       		TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD')  AS frstRegistPnttm,
       		a.frst_register_id	AS frstRegisterId,
@ -103,35 +105,65 @@
 	</select>
 	
 	<!-- 강사 정보 U -->
-	<update id="VELctrRsrchMngDAO.update" parameterClass="VELctrDetailVO">
-		UPDATE
-			<include refid="VELctrRsrchMngDAO.table_name"/>
-		SET
-		
-			last_updt_pnttm=now() 
-			, last_updusr_id=#lastUpdusrId#	
-			
-		<isNotEmpty property="rsrchStrtDt">
-			, rsrch_strt_dt	= #rsrchStrtDt#
-			
-		</isNotEmpty><isNotEmpty property="rsrchEndDt">
-			, rsrch_end_dt	= #rsrchEndDt#
-			
-		</isNotEmpty>		
+	<update id="VELctrRsrchMngDAO.update" parameterClass="VELctrDetailVO">		   
+		   
+		/*	VELctrRsrchMngDAO.update	*/
+		MERGE INTO <include refid="VELctrRsrchMngDAO.table_name"/>
+		USING DUAL
+		ON(rsrch_instr_div	= #rsrchInstrDiv#	
+			AND stng_yr_mnt	= #stngYrMnt#)				
 		
+		WHEN NOT MATCHED THEN
+			INSERT				
+					(
+						<include refid="VELctrRsrchMngDAO.column_name"/>
+					)
+			VALUES(		
+
+				#rsrchInstrDiv#,
+		        #stngYrMnt#,
+		        
+	       		#rsrchStrtDt#,
+	       		#rsrchEndDt#,       		
+       				
+	       			
+	       		SYSDATE,
+	       		#frstRegisterId#,
+	       		NULL,
+	       		NULL
+       				
+			)		
+		WHEN MATCHED THEN
+			UPDATE
+				SET last_updt_pnttm 	= SYSDATE
+					, last_updusr_id 	= #frstRegisterId#
+
+				<isNotEmpty property="rsrchStrtDt">					
+					, rsrch_strt_dt					=	#rsrchStrtDt#
+				</isNotEmpty>
+
+				<isNotEmpty property="rsrchEndDt">					
+					, rsrch_end_dt					=	#rsrchEndDt#
+				</isNotEmpty>
+
+				<isNotEmpty property="rsrchState">
+					<isEqual property="rsrchState" compareValue="00">
+						, lctr_rsrch_state					=	null
+					</isEqual>
+					<isNotEqual property="rsrchState" compareValue="00">
+						, lctr_rsrch_state					=	#rsrchState#
+					</isNotEqual>									
 					
-		WHERE
-		   rsrch_instr_div	= #rsrchInstrDiv#
-		   AND stng_yr_mnt	= #stngYrMnt#
+				</isNotEmpty>											   
 	</update>	
 	
 	<!-- 강사 정보 D -->
 	<delete id="VELctrRsrchMngDAO.delete" parameterClass="VELctrDetailVO">
+		/*	VELctrRsrchMngDAO.delete	*/
 		DELETE FROM 
 			<include refid="VELctrRsrchMngDAO.table_name"/>
 		WHERE
 		   rsrch_instr_div	= #rsrchInstrDiv#
-		   AND stng_yr		= #stngYr#
 		   AND stng_yr_mnt	= #stngYrMnt#
 		
 	</delete>
@ -146,11 +178,16 @@
 				
 		WHERE 1=1
 				
+		<isNotEmpty property="stngYrMnt">
+			AND a.stng_yr_mnt	= #stngYrMnt#
+			
+		</isNotEmpty>
+						
 		<isNotEmpty property="selectPagingListQuery">
 			$selectPagingListQuery$
 		</isNotEmpty>
 						
-		ORDER BY 1=1					
+		ORDER BY 1				
 			
 		<isEmpty property="orderByQuery">
 			, a.stng_yr_mnt desc
@ -226,13 +263,15 @@
 						, dddd.instr_div			AS	instrDiv
 						, dddd.instr_detail_ord           AS instrDetailOrd
 						
+						/*
 		                 , (SELECT  f.one_depth_nm
 		                 FROM     ve_rsdnc f
 		                 WHERE    f.post_id = MAX(eeee.area_cd)
 		                 GROUP BY f.one_depth_nm
 		                 )
 		                                  AS lctrAreaNm
-		                 , COUNT(eeee.area_cd) AS lctrAreaCnt				
+		                 , COUNT(eeee.area_cd) AS lctrAreaCnt
+		                 */				
 						
 		FROM (
 					SELECT aaa.rsrch_instr_div
@ -244,6 +283,7 @@
 						, aaa.user_id
 						, aaa.qlfct_end_yn
 						, ccc.lctr_stng_ord
+						/*
 						, IF(NVL(ccc.sun_lctr_yn, ddd.sun_lctr_yn)='Y',1,0)
 						+ IF(NVL(ccc.mon_lctr_yn, ddd.mon_lctr_yn)='Y',1,0)
 						+ IF(NVL(ccc.tue_lctr_yn, ddd.tue_lctr_yn)='Y',1,0)
@ -251,6 +291,16 @@
 						+ IF(NVL(ccc.thu_lctr_yn, ddd.thu_lctr_yn)='Y',1,0)
 						+ IF(NVL(ccc.fri_lctr_yn, ddd.fri_lctr_yn)='Y',1,0)
 						+ IF(NVL(ccc.sat_lctr_yn, ddd.sat_lctr_yn)='Y',1,0) AS w_cnt
+						*/
+						
+						, CASE WHEN NVL(ccc.sun_lctr_yn, ddd.sun_lctr_yn)='Y'	THEN 1	ELSE 0	END
+						+ CASE WHEN NVL(ccc.mon_lctr_yn, ddd.mon_lctr_yn)='Y'	THEN 1	ELSE 0	END
+						+ CASE WHEN NVL(ccc.tue_lctr_yn, ddd.tue_lctr_yn)='Y'	THEN 1	ELSE 0	END
+						+ CASE WHEN NVL(ccc.wed_lctr_yn, ddd.wed_lctr_yn)='Y'	THEN 1	ELSE 0	END
+						+ CASE WHEN NVL(ccc.thu_lctr_yn, ddd.thu_lctr_yn)='Y'	THEN 1	ELSE 0	END
+						+ CASE WHEN NVL(ccc.fri_lctr_yn, ddd.fri_lctr_yn)='Y'	THEN 1	ELSE 0	END
+						+ CASE WHEN NVL(ccc.sat_lctr_yn, ddd.sat_lctr_yn)='Y'	THEN 1	ELSE 0	END
+						 AS w_cnt
 						, ddd.lctr_stng_ord AS other_lctr_stng_ord
 						, ddd.instr_div	
 						, aaa.instr_detail_ord
@ -345,6 +395,7 @@
 						, dddd.w_cnt
 						, dddd.other_lctr_stng_ord
 						, dddd.instr_div	                          
+						, dddd.instr_detail_ord
 						

 	
--- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchSbmt_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchSbmt_SQL_Tibero.xml
@ -39,9 +39,9 @@
 	        a.lctr_stng_ord		AS	lctrStngOrd,
 	            		       		
       		
-       		DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d')  AS frstRegistPnttm,
+       		TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD')  AS frstRegistPnttm,
       		a.frst_register_id	AS frstRegisterId,
-       		DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d')  AS lastUpdtPnttm,       		
+       		TO_CHAR(a.last_updt_pnttm,'YYYY-MM-DD')  AS lastUpdtPnttm,       		
       		a.last_updusr_id	AS lastUpdusrId,
       		
       		a.strt_dt			AS	strtDt,
@ -85,7 +85,7 @@
 	
 	<!-- 강사 정보 R -->
 	<select id="VELctrRsrchSbmtDAO.selectDetail" parameterClass="VELctrDetailVO" resultClass="VELctrDetailVO">
-	/*	해당 강의 조사 기간에 대해 강사가 작성한 정보가 있는지 확인 - 관리자	*/
+	/*	해당 강의 조사 기간에 대해 강사가 작성한 정보가 있는지 확인 - 관리자		VELctrRsrchSbmtDAO.selectDetail	*/
 		SELECT
 			<include refid="VELctrRsrchSbmtDAO.select_column_name"/>			
 		FROM 
@ -111,7 +111,7 @@

 	<!-- 강사 정보 R -->
 	<select id="VELctrRsrchSbmtDAO.selectDetailNew" parameterClass="VELctrDetailVO" resultClass="VELctrDetailVO">
-	/*	해당 강의 조사 기간에 대해 강사가 작성한 정보가 있는지 확인	*/
+	/*	해당 강의 조사 기간에 대해 강사가 작성한 정보가 있는지 확인	VELctrRsrchSbmtDAO.selectDetailNew	*/
 	/*	순번데이터 없이 해당 조사 제출을 한 강사 정보가 있는지 확인 하는 것임 since 2023.07.25 	*/
 		SELECT
 			<include refid="VELctrRsrchSbmtDAO.select_column_name"/>
--- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctr_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctr_MIX_SQL_Tibero.xml
@ -90,9 +90,9 @@
       		a.aprvl_id			AS aprvlId,
       		a.aprvl_cn			AS aprvlCn,	      		       		
       		
-       		DATE_FORMAT(a.frst_regist_pnttm,'%Y-%m-%d')  AS frstRegistPnttm,
+       		TO_CHAR(a.frst_regist_pnttm,'YYYY-MM-DD')  AS frstRegistPnttm,
       		a.frst_register_id	AS frstRegisterId,
-       		DATE_FORMAT(a.last_updt_pnttm,'%Y-%m-%d')  AS lastUpdtPnttm,       		
+       		TO_CHAR(a.last_updt_pnttm,'YYYY-MM-DD')  AS lastUpdtPnttm,       		
       		a.last_updusr_id	AS lastUpdusrId,
       		
       		a.use_yn			AS useYn,
@ -229,7 +229,7 @@
 			
 			
 				
-		ORDER BY 1=1					
+		ORDER BY 1
 			
 		<isEmpty property="orderByQuery">
 			, a.user_id desc
@ -239,7 +239,10 @@
 		</isNotEmpty>
 		
 				
-		LIMIT #recordCountPerPage# OFFSET #firstIndex#
+		/*
+			LIMIT recordCountPerPage OFFSET firstIndex
+			*/
+			OFFSET #firstIndex# ROWS FETCH NEXT #recordCountPerPage# ROWS ONLY;
 					
 	</select>

@ -282,7 +285,7 @@
 								UNION ALL	SELECT '12'	
 				)bb
 		WHERE 1=1
-			AND DATE_FORMAT(DATE_ADD(NOW(), INTERVAL 1 month),'%Y%m')>=CONCAT(aa.stndrd_yr,bb.stndrd_mnt)
+			AND TO_CHAR(DATE_ADD(SYSDATE, INTERVAL 1 month),'YYYYMM')>=aa.stndrd_yr||bb.stndrd_mnt
 		ORDER BY CONCAT(aa.stndrd_yr,bb.stndrd_mnt) DESC
 					
 	</select>
--- a/src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Tibero.xml
@ -70,13 +70,16 @@
 	<select id="VERsdncMIXDAO.selectRsdncStep2List" parameterClass="VERsdncVO" resultClass="VERsdncVO">
 		/*	강의 지역	-	Depth 2	*/
 		SELECT aa.*
-			, IFNULL(bb.area_cd, 0) cnt
+			, NVL(bb.area_cd, 0) cnt
 		FROM (
 					SELECT one_depth_nm		AS oneDepthNm
 					/*
 						, a.two_depth_nm	AS twoDepthNm
 						*/
-						, IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm) AS twoDepthNm 
+						/*
+						, IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm) AS twoDepthNm
+						*/
+						, CASE WHEN a.two_depth_nm IS NULL OR a.two_depth_nm ='' THEN a.three_depth_nm ELSE a.two_depth_nm END AS twoDepthNm 
 						, MAX(post_id) postId
 					FROM ve_rsdnc a
 					WHERE 1=1
@ -85,13 +88,19 @@
 					</isNotEmpty>			
 					
 					GROUP BY one_depth_nm
+						/*
 						, IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm)
+						*/
+						, CASE WHEN a.two_depth_nm IS NULL OR a.two_depth_nm ='' THEN a.three_depth_nm ELSE a.two_depth_nm END
 						/*
 							, a.two_depth_nm
 						*/
 					
 					ORDER BY one_depth_nm
+						/*
 						, IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm)
+						*/
+						, CASE WHEN a.two_depth_nm IS NULL OR a.two_depth_nm ='' THEN a.three_depth_nm ELSE a.two_depth_nm END
 						/*
 							, a.two_depth_nm
 						*/			
@ -126,13 +135,16 @@
 	<select id="VERsdncMIXDAO.selectRsdncStep2ListNew" parameterClass="VERsdncVO" resultClass="VERsdncVO">
 		/*	강의 지역	-	Depth 2	*/
 		SELECT aa.*
-			, IFNULL(bb.area_cd, 0) cnt
+			, NVL(bb.area_cd, 0) cnt
 		FROM (
 					SELECT one_depth_nm		AS oneDepthNm
 					/*
 						, a.two_depth_nm	AS twoDepthNm
 						*/
-						, IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm) AS twoDepthNm 
+						/*
+						, IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm) AS twoDepthNm
+						*/
+						, CASE WHEN a.two_depth_nm IS NULL OR a.two_depth_nm ='' THEN a.three_depth_nm ELSE a.two_depth_nm END AS twoDepthNm 
 						, MAX(post_id) postId
 					FROM ve_rsdnc a
 					WHERE 1=1
@ -141,13 +153,19 @@
 					</isNotEmpty>			
 					
 					GROUP BY one_depth_nm
+						/*
 						, IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm)
+						*/
+						, CASE WHEN a.two_depth_nm IS NULL OR a.two_depth_nm ='' THEN a.three_depth_nm ELSE a.two_depth_nm END
 						/*
 							, a.two_depth_nm
 						*/
 					
 					ORDER BY one_depth_nm
+						/*
 						, IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm)
+						*/
+						, CASE WHEN a.two_depth_nm IS NULL OR a.two_depth_nm ='' THEN a.three_depth_nm ELSE a.two_depth_nm END
 						/*
 							, a.two_depth_nm
 						*/			
@ -202,15 +220,18 @@
 	<!-- 거주지 2단계 -->
 	<!-- //관리자에서 강사의 현재 선택 지역 정보를 가져오기 위한 쿼리임 - 2023.07.26 -->	
 	<select id="VERsdncMIXDAO.selectRsdncStep2ListNewAdmin" parameterClass="VERsdncVO" resultClass="VERsdncVO">
-		/*	강의 지역	-	Depth 2	*/
+		/*	강의 지역	-	Depth 2	VERsdncMIXDAO.selectRsdncStep2ListNewAdmin	*/
 		SELECT aa.*
-			, IFNULL(bb.area_cd, 0) cnt
+			, NVL(bb.area_cd, 0) cnt
 		FROM (
 					SELECT one_depth_nm		AS oneDepthNm
 					/*
 						, a.two_depth_nm	AS twoDepthNm
 						*/
-						, IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm) AS twoDepthNm 
+						/*
+						, IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm) AS twoDepthNm
+						*/ 
+						, CASE WHEN a.two_depth_nm is NULL OR a.two_depth_nm ='' THEN a.three_depth_nm ELSE a.two_depth_nm END AS twoDepthNm
 						, MAX(post_id) postId
 					FROM ve_rsdnc a
 					WHERE 1=1
@ -219,13 +240,13 @@
 					</isNotEmpty>			
 					
 					GROUP BY one_depth_nm
-						, IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm)
+						, CASE WHEN a.two_depth_nm is NULL OR a.two_depth_nm ='' THEN a.three_depth_nm ELSE a.two_depth_nm END
 						/*
 							, a.two_depth_nm
 						*/
 					
 					ORDER BY one_depth_nm
-						, IF(a.two_depth_nm is NULL OR a.two_depth_nm ='',a.three_depth_nm, a.two_depth_nm)
+						, CASE WHEN a.two_depth_nm is NULL OR a.two_depth_nm ='' THEN a.three_depth_nm ELSE a.two_depth_nm END
 						/*
 							, a.two_depth_nm
 						*/			
--- a/src/main/resources/egovframework/sqlmap/ve/tngr/VEAAreaLctrStng_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEAAreaLctrStng_SQL_Tibero.xml
@ -86,8 +86,7 @@
 	</select>
 	
 	<!-- 강사 정보 U -->
-	<update id="VEAAreaLctrStngDAO.update" parameterClass="VEAStngVO">				
-
+	<update id="VEAAreaLctrStngDAO.update" parameterClass="VEAStngVO">	
 		/*	VEAAreaLctrStngDAO.update	*/
 		MERGE INTO <include refid="VEAAreaLctrStngDAO.table_name"/>
 		USING DUAL
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp
@ -319,6 +319,8 @@
 						<button type="button" class="btn_type01" onclick="fncGoRegExcel(); return false;">Excel등록</button>
 						<button type="button" class="btn_type01" onclick="fncGoReg(); return false;">등록</button>
 						 -->
+						 <button type="button" class="btn_type01" onclick="fncGoList(); return false;">목록</button>
+						 
 					</div>
 				</div>				
 			</div>
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngList.jsp
@ -132,6 +132,146 @@
 				});
 			}
 		}
+
+		//강의조사요청관리 팝업
+		function fncLctrRsrchStng() {
+			//var p_stngYr 		= $("#stngYr").val();
+
+			/*
+			if(p_stngYr==''){
+				alert("회차관리 대상 년도를 선택해주세요.");
+				return false;
+			}
+			*/
+			//document.listForm.yr.value = p_stngYr;
+			
+		    //document.listForm.authorCode.value = vAuthorCode;
+		    //document.listForm.action = "<c:url value='/kccadr/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.do'/>";
+		    document.listForm.action = "<c:url value='/kccadr/oprtn/tngrVisitEdu/popup/advLctrRsrchStngMngPopup.do'/>";
+		    
+		    window.open("#", "_lctrRsrchPop", "scrollbars = no, top=100px, left=100px, height=800px, width=1000px");    
+		    document.listForm.target = "_lctrRsrchPop";
+		    document.listForm.submit();  
+		}		
+
+		//강의조사요청관리 팝업
+		function fncLctrRsrchDetailStng(
+				/*
+				p_stngYr
+				, p_stngMnt
+				, p_stngYrMnt
+				*/
+				p_stngYrMnt
+				) {
+
+			//alert(p_stngYrMnt.substring(0,4));
+			//alert(p_stngYrMnt.substring(4,6));
+			
+			//return;
+			document.listForm.stngYr.value = p_stngYrMnt.substring(0,4);
+			document.listForm.stngMnt.value = p_stngYrMnt.substring(4,6);
+			document.listForm.stngYrMnt.value = p_stngYrMnt;
+			
+		    //document.listForm.authorCode.value = vAuthorCode;
+		    //document.listForm.action = "<c:url value='/kccadr/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.do'/>";
+		    document.listForm.action = "<c:url value='/kccadr/oprtn/tngrVisitEdu/popup/advLctrRsrchStngMngPopup.do'/>";
+		    
+		    window.open("#", "_lctrRsrchPop", "scrollbars = no, top=100px, left=100px, height=800px, width=1000px");    
+		    document.listForm.target = "_lctrRsrchPop";
+		    document.listForm.submit();  
+		}			
+
+		//강의조사 요청 삭제
+		function fncLctrRsrchDelete(
+				p_instrDiv
+				, p_stngYrMnt
+				){			
+			
+			//var p_rgstrPsblTm 	= $(thisObj).closest("td").find("input[name=rgstrPsblTm]").val();	
+			//var p_stngYr 		= $("#stngYr").val();
+			//var p_prdDivCd 		= $("#prdDivCd").val();
+			//var p_instrDiv 		= $("input[name=instrDiv]").val();
+			//var p_areaCd	 	= $(thisObj).closest("tr").find("input[name=checkList]").val();
+			
+			//alert(p_areaCd);
+			
+			if(confirm("강의조사 일정을 삭제하시겠습니까?")){
+				//동일한 값은 업데이트로 수정
+				$.ajax({
+					type:"POST",
+					url: "${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/lctrRsrchMngDelAjax.do",
+					data:{
+						"rsrchInstrDiv"		:  p_instrDiv, 
+						"stngYrMnt"			:  p_stngYrMnt,
+						},
+					dataType:'json',
+					
+					//async: false,
+					//processData: false,
+					//contentType: false,
+					cache: false,					
+					
+					success:function(returnData){
+						if(returnData.result == "success"){
+							alert("삭제 되었습니다.");	
+							location.reload();
+														
+						}else{
+							alert("삭제 중 오류가 발생하였습니다.");
+						}						
+					},
+					error:function(request , status, error){
+						alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+					}
+				});
+			}
+		}			
+
+		//강의조사 마감 처리
+		function fncLctrRsrchChgState(
+				p_instrDiv
+				, p_stngYrMnt
+				, p_rsrchState
+				){			
+			
+			//var p_rgstrPsblTm 	= $(thisObj).closest("td").find("input[name=rgstrPsblTm]").val();	
+			//var p_stngYr 		= $("#stngYr").val();
+			//var p_prdDivCd 		= $("#prdDivCd").val();
+			//var p_instrDiv 		= $("input[name=instrDiv]").val();
+			//var p_areaCd	 	= $(thisObj).closest("tr").find("input[name=checkList]").val();
+						
+			//if(confirm("강의조사 일정을 삭제하시겠습니까?")){
+				//동일한 값은 업데이트로 수정
+				$.ajax({
+					type:"POST",
+					url: "${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/lctrRsrchMngChangeAjax.do",
+					data:{
+						"rsrchInstrDiv"		:  p_instrDiv, 
+						"stngYrMnt"			:  p_stngYrMnt,
+						"rsrchState"		:  p_rsrchState,
+						},
+					dataType:'json',
+					
+					//async: false,
+					//processData: false,
+					//contentType: false,
+					cache: false,					
+					
+					success:function(returnData){
+						if(returnData.result == "success"){
+							alert("처리 되었습니다.");	
+							location.reload();
+														
+						}else{
+							alert("처리 중 오류가 발생하였습니다.");
+						}						
+					},
+					error:function(request , status, error){
+						alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+					}
+				});
+			//}
+		}			
 	</script>
 	<title>강의조사 요청목록</title>
 </head>
@ -141,6 +281,8 @@
 	<input type="hidden" name="searchSortCnd" value="<c:out value="${vEInstrDetailVO.searchSortCnd}" />" />
 	<input type="hidden" name="searchSortOrd" value="<c:out value="${vEInstrDetailVO.searchSortOrd}" />" />
 	<input type="hidden" name="rsrchInstrDiv" value="" />
+	<input type="hidden" name="stngYr" value="" />
+	<input type="hidden" name="stngMnt" value="" />
 	<input type="hidden" name="stngYrMnt" value="" />


@ -162,6 +304,7 @@

 			<div class="cont">
 				<!-- list_top -->
+				<!-- 
 				<div class="list_top">
 				
 					<div class="list_top_1">
@ -200,6 +343,7 @@
 						
 <%-- 							<input type="text" id=searchKeyword name="searchKeyword" placeholder="검색어를 입력하세요." title="검색어 입력" class="search_input" value="<c:out value='${vEInstrDetailVO.searchKeyword}'/>"> --%>
 							<button type="button" class="btn_type08" onclick="fncLctrRsrchReg(); return false;">강의조사 요청</button>
+							<button class="btn_type06" onclick="fncLctrRsrchStng(); return false;" >강의조사요청관리</button>
 						</div>
 					</div>
 					<div class="list_top_2">
@ -217,16 +361,35 @@
 						</div>
 					</div>
 				</div>
+				 -->
 				<!-- //list_top -->

+				<div class="btn_wrap btn_layout01">
+					<div class="btn_left">
+					</div>
+					<div class="btn_center">
+					</div>
+					<div class="btn_right">
+					<!-- 
+						<button type="button" class="btn_type01" onclick="fncGoRegExcel(); return false;">Excel등록</button>
+						<button type="button" class="btn_type01" onclick="fncGoReg(); return false;">등록</button>
+						 -->
+<!-- 						 <button type="button" class="btn_type01" onclick="fncGoList(); return false;">목록</button> -->
+						 <button class="btn_type06" onclick="fncLctrRsrchStng(); return false;" >강의조사요청관리</button>
+						 
+					</div>
+				</div>	
+				<br/>
+
 				<!-- list -->
 				<div class="tb_type01">
 					<table>
 						<colgroup>
-							<col style="width: 20%">
-							<col style="width: 20%">
-							<col style="width: 20%">
-							<col style="width: 20%">							
+							<col style="width: 15%">
+							<col style="width: 15%">
+							<col style="width: 15%">
+							<col style="width: 15%">							
+							<col style="width: 15%">
 							<col style="width: auto">

 						</colgroup>
@ -237,23 +400,28 @@
 							<th>조사마감일</th>
 							<th>참여현황</th>
 							<th>마감여부</th>
+							<th>관리</th>
 						</tr>
 						</thead>
 						<tbody>
 						<c:forEach var="list" items="${list}" varStatus="status">
-							<tr onclick="fncGoDetail('<c:out value="${list.rsrchInstrDiv}"/>', '<c:out value="${list.stngYrMnt}"/>');" style="cursor:pointer;">
+<%-- 							<tr onclick="fncGoDetail('<c:out value="${list.rsrchInstrDiv}"/>', '<c:out value="${list.stngYrMnt}"/>');" style="cursor:pointer;"> --%>
+							<tr>
 								<td>
-									<fmt:parseDate value="${list.stngYrMnt}" var="stngYrMnt" pattern="yyyyMM"/>
-									<fmt:formatDate value="${stngYrMnt}" pattern="yyyy.MM"/>
+									${list.stngYrMnt}
+<%-- 									<fmt:parseDate value="${list.stngYrMnt}" var="stngYrMnt" pattern="yyyyMM"/> --%>
+<%-- 									<fmt:formatDate value="${stngYrMnt}" pattern="yyyy.MM"/> --%>
 								</td>
 								<td>
-									<fmt:parseDate value="${list.rsrchStrtDt}" var="rsrchStrtDt" pattern="yyyyMMdd"/>
-									<fmt:formatDate value="${rsrchStrtDt}" pattern="yyyy.MM.dd"/>							
+									${list.rsrchStrtDt}
+<%-- 									<fmt:parseDate value="${list.rsrchStrtDt}" var="rsrchStrtDt" pattern="yyyyMMdd"/> --%>
+<%-- 									<fmt:formatDate value="${rsrchStrtDt}" pattern="yyyy.MM.dd"/>							 --%>
 									
 								</td>
 								<td>
-									<fmt:parseDate value="${list.rsrchEndDt}" var="rsrchEndDt" pattern="yyyyMMdd"/>
-									<fmt:formatDate value="${rsrchEndDt}" pattern="yyyy.MM.dd"/>
+									${list.rsrchEndDt}
+<%-- 									<fmt:parseDate value="${list.rsrchEndDt}" var="rsrchEndDt" pattern="yyyyMMdd"/> --%>
+<%-- 									<fmt:formatDate value="${rsrchEndDt}" pattern="yyyy.MM.dd"/> --%>
 																	
 								</td>
 								<td>
@ -263,10 +431,29 @@
 								<td>
 									<ve:code codeId="VE0034" code="${list.rsrchState }"/>           
 								</td>
+								<td>
+<%-- 									<ve:code codeId="VE0034" code="${list.rsrchState }"/>   --%>
+									<button class="btn_type06" onclick="fncGoDetail('<c:out value="${list.rsrchInstrDiv}"/>', '<c:out value="${list.stngYrMnt}"/>'); return false;" >상세</button>
+									
+									<button class="btn_type06" onclick="fncLctrRsrchChgState('<c:out value="${list.rsrchInstrDiv}"/>', '<c:out value="${list.stngYrMnt}"/>', '<c:out value="${list.rsrchState}"/>'); return false;" >
+									<c:if test="${list.rsrchState eq '03'}">
+									마감해제
+									</c:if>
+									<c:if test="${list.rsrchState ne '03'}">
+									마감
+									</c:if>
+									</button>
+									
+									<button class="btn_type06" onclick="fncLctrRsrchDetailStng('<c:out value="${list.stngYrMnt}"/>'); return false;" >수정</button>
+									<c:if test="${list.lctrStngOrdSbmt eq '0'}">
+										<button class="btn_type06" onclick="fncLctrRsrchDelete('<c:out value="${list.rsrchInstrDiv}"/>', '<c:out value="${list.stngYrMnt}"/>'); return false;" >삭제</button>													
+									</c:if>
+									         
+								</td>								
 							</tr>
 						</c:forEach>
 						<c:if test="${empty list}">
-							<tr><td colspan="5"><spring:message code="common.nodata.msg" /></td></tr>
+							<tr><td colspan="6"><spring:message code="common.nodata.msg" /></td></tr>
 						</c:if>
 						</tbody>
 					</table>
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advLctrRsrchStngMngPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advLctrRsrchStngMngPopup.jsp
@ -0,0 +1,548 @@
+<!DOCTYPE html>
+<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
+<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
+<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
+<%
+	/**
+	 * @Class Name : advLctrRsrchStngMngPopup.jsp
+	 * @Description : 강의조사관리 팝업
+	 * @Modification Information
+	 * @
+	 * @  수정일      수정자          수정내용
+	 * @  -------     --------    ---------------------------
+	 * @ 2021.08.09   김봉호          최초 생성
+	 *  @author 김봉호
+	 *  @since 2021.08.21
+	 *  @version 1.0
+	 *  @see
+	 *
+	 */
+%>
+<html lang="ko">
+<head>
+	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">	
+	
+	<link rel="stylesheet" href="${pageContext.request.contextPath}/visitEdu/adm/publish/datepicker/classic.css">
+	<link rel="stylesheet" href="${pageContext.request.contextPath}/visitEdu/adm/publish/datepicker/classic.date.css">
+	
+	<script src="${pageContext.request.contextPath}/visitEdu/adm/publish/datepicker/picker.js"></script>
+	<script src="${pageContext.request.contextPath}/visitEdu/adm/publish/datepicker/picker.date.js"></script>
+	<script src="${pageContext.request.contextPath}/visitEdu/adm/publish/datepicker/legacy.js"></script>
+	<script src="${pageContext.request.contextPath}/visitEdu/adm/publish/datepicker/ko_KR.js"></script>
+	
+	<script type="text/javascript">
+	</script>
+	<title>신청반려팝업</title>
+	<script type="text/javaScript" language="javascript">
+
+		$(document).ready(function(){
+			var mode = '${adjReqMgrVO.mode}';
+			if(mode == "D"){
+				$("input[type=checkbox],textarea").not("textarea[name=rejtReson]").attr("disabled" , true);
+			}
+
+		});
+
+		function fncAprooval(){
+			var msg = "강의가능시간 변경";
+			
+			var data1 = new FormData(document.getElementById("createForm"));
+			
+			//console.log(data);
+			console.log(data1);
+			
+			if (confirm(msg+" 하시겠습니까?")) {
+				$.ajax({				
+					type: "POST",
+					url: "${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/popup/areaLctrMngLctrPsblTmPopupAjax.do",
+					//data: JSON.stringify(data),
+					data: data1,
+					dataType:'json',
+					async: false,
+					processData: false,
+					contentType: false,
+					cache: false,
+					success: function (returnData, status) {
+						console.log(returnData.rs);
+						if(returnData.result == 'success'){
+							alert("정상적으로 "+ msg +" 되었습니다.");
+							opener.location.reload();
+							self.close();
+						}else{
+							alert(returnData.message);
+						}
+					},
+					error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); }
+				});
+			}
+		}
+
+		function validationForm(data){
+			/*
+			var len = $("input[type='checkbox']:checked").length;
+
+			if (len <= 0) {
+				alert("보완요청항목을 선택해주세요.");
+				return false;
+			}
+			*/
+			
+			
+			if ($("[name='aprvlCn']").val() == '') {
+				alert("사유를 입력해주세요.");
+				return false;
+			}
+
+			/*
+			if ($("[name='adrSeq']").val() == '') {
+				alert("신청번호가 없습니다. 관리자에게 문의해주세요.");
+				return false;
+			}
+			*/
+
+			return true;
+		}
+
+		function fncGoEdit(){
+			var createForm = document.createForm ;
+			createForm.mode.value = "C";
+			createForm.action = "<c:url value='/kccadr/adjReqMgr/popup/adjReqMgrRegSecurityPopup.do'/>";
+			createForm.submit();
+		}
+
+		function fncStatusUpdate(confirmYn){
+			var msg = "승인";
+			var data = {};
+			data.adrSeq = '${security.adrSeq}';
+			data.edtSn = '${security.edtSn}';
+			data.apprYn = 'Y';
+			data.rejtReson = $("#rejtReson").val();
+			//data.statCd = '010100';	// 작성중 상태로 변경
+			if(confirmYn == "N"){
+				data.apprYn = 'N';	// 미승인 상태
+				msg = "반려";
+			}
+
+			if (confirm(msg+" 하시겠습니까?")) {
+				$.ajax({
+					type: "POST",
+					url: "/kccadr/adjReqMgr/popup/adjReqMgrRegSecurityStatusChange.do",
+					data: JSON.stringify(data),
+					dataType:'json',
+					async: false,
+					processData: false,
+					contentType: "application/json",
+					cache: false,
+					success: function (returnData, status) {
+						console.log(returnData.rs);
+						if(returnData.result == 'SUCCESS'){
+							alert("정상적으로 "+ msg +" 되었습니다.");
+							opener.location.reload();
+							self.close();
+						}else{
+							alert(returnData.message);
+						}
+					},
+					error: function (e) { alert("저장에 실패하였습니다."); console.log("ERROR : ", e); }
+				});
+			}
+		}
+
+		function fncPopClose(){
+			self.close();
+		}
+
+		//회차관리 변경
+		function fncRndsSave(thisObj){
+			//alert($("#ord_1").val());
+			//alert($(thisObj).closest("td"));
+			//alert($(thisObj).closest("td").find("input[name=ord_1]").length);
+			var p_ord 	= $(thisObj).closest("td").find("input[name=ord_1]").val();
+
+			var p_rgstrStrtPnttm_dt 	= $(thisObj).closest("td").find("input[name=rgstrStrtPnttm_dt]").val();
+			var p_rgstrStrtPnttm_tm 	= $(thisObj).closest("td").find("input[name=rgstrStrtPnttm_tm]").val();
+			var p_rgstrDdlnPnttm_dt 	= $(thisObj).closest("td").find("input[name=rgstrDdlnPnttm_dt]").val();
+			var p_rgstrDdlnPnttm_tm 	= $(thisObj).closest("td").find("input[name=rgstrDdlnPnttm_tm]").val();
+
+			var p_yr 					= $("#yr").val();
+			var p_ord 					= $("#ord").val();
+
+			var p_rgstrStrtPnttm_dt 	= $("#rgstrStrtPnttm_dt").val();
+			var p_rgstrStrtPnttm_tm 	= $("#rgstrStrtPnttm_tm").val();
+			var p_rgstrDdlnPnttm_dt 	= $("#rgstrDdlnPnttm_dt").val();
+			var p_rgstrDdlnPnttm_tm 	= $("#rgstrDdlnPnttm_tm").val();
+			
+			//alert(p_areaCd);
+			
+			//if(p_psblTmQntty != "") {
+			if(true) {
+				
+				$.ajax({
+					type:"POST",
+					url:"${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/popup/advRndsSaveAjax.do",					
+					data:{						
+						"yr"				:  p_yr,
+						"ord"				:  p_ord,
+						"rgstrStrtPnttm"	:  p_rgstrStrtPnttm_dt+p_rgstrStrtPnttm_tm,
+						"rgstrDdlnPnttm"	:  p_rgstrDdlnPnttm_dt+p_rgstrDdlnPnttm_tm,
+						},
+					dataType:'json',
+					success:function(returnData){
+						
+						if(returnData.result == "success"){
+							alert("변경 처리 되었습니다.");	
+							fncGoList();
+						}else{
+							alert("변경 중 오류가 발생하였습니다.");
+						}						
+					},
+					error:function(request , status, error){
+						alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+					}
+				});
+			}else{
+				alert("교육가능시수를 입력해주세요.");
+			}
+		}			
+
+		function fncGoList(){
+			linkPage(1);
+		}
+
+		function linkPage(pageNo){
+			var listForm = document.createForm ;
+
+			listForm.stngYr.value 	= $('#p_stngYr').val();
+			listForm.stngMnt.value 	= $('#p_stngMnt').val();
+			listForm.stngYrMnt.value 	= $('#p_stngYr').val()+$('#p_stngMnt').val();
+			
+			//listForm.searchCondition.value = $('#searchCondition').val();
+			//listForm.searchKeyword.value = $('#searchKeyword').val();
+			listForm.action = "<c:url value='/kccadr/oprtn/tngrVisitEdu/popup/advLctrRsrchStngMngPopup.do'/>";
+			listForm.submit();
+		}		
+
+		//회차관리 변경
+		function fncRndsUpdate(p_rndsOrd){
+			//alert($("#ord_1").val());
+			//alert($(thisObj).closest("td"));
+			//alert($(thisObj).closest("td").find("input[name=ord_1]").length);
+			//var p_ord 	= $(thisObj).closest("td").find("input[name=ord_1]").val();
+			//$("#${list.rndsOrd}"+" #lctrPsblStrtTm").val('${list.dpStrtTm}');
+
+			var p_rgstrStrtPnttm_dt 	= $("#"+p_rndsOrd+" #aplctPrdStrt").val();
+			var p_rgstrStrtPnttm_tm 	= $("#"+p_rndsOrd+" #lctrPsblStrtTm").val();
+			
+			var p_rgstrDdlnPnttm_dt 	= $("#"+p_rndsOrd+" #aplctPrdEnd").val();
+			var p_rgstrDdlnPnttm_tm 	= $("#"+p_rndsOrd+" #lctrPsblEndTm").val();
+			
+
+			var p_ord 					= $("#"+p_rndsOrd+" #psblTmQntty").val();
+			
+			//alert(p_areaCd);
+			
+			//if(p_psblTmQntty != "") {
+			if(true) {
+				
+				$.ajax({
+					type:"POST",
+					url:"${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/popup/advRndsUpdateAjax.do",					
+					data:{				
+						"rndsOrd"			:  p_rndsOrd,		
+						//"yr"				:  p_yr,
+						"ord"				:  p_ord,
+						"rgstrStrtPnttm"	:  p_rgstrStrtPnttm_dt+p_rgstrStrtPnttm_tm,
+						"rgstrDdlnPnttm"	:  p_rgstrDdlnPnttm_dt+p_rgstrDdlnPnttm_tm,
+						},
+					dataType:'json',
+					success:function(returnData){
+						
+						if(returnData.result == "success"){
+							alert("변경 처리 되었습니다.");	
+							fncGoList();
+						}else{
+							alert("변경 중 오류가 발생하였습니다.");
+						}						
+					},
+					error:function(request , status, error){
+						alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+					}
+				});
+			}else{
+				alert("교육가능시수를 입력해주세요.");
+			}
+		}		
+
+		//회차관리 삭제
+		function fncRndsDelete(p_rndsOrd){						
+			//if(p_psblTmQntty != "") {
+			if(true) {
+				
+				$.ajax({
+					type:"POST",
+					url:"${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/popup/advRndsDeleteAjax.do",					
+					data:{						
+						"rndsOrd"			:  p_rndsOrd,
+						},
+					dataType:'json',
+					success:function(returnData){
+						
+						if(returnData.result == "success"){
+							alert("삭제 처리 되었습니다.");	
+							fncGoList();
+						}else{
+							alert("삭제 중 오류가 발생하였습니다.");
+							fncGoList();
+						}						
+					},
+					error:function(request , status, error){
+						alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+					}
+				});
+			}else{
+				alert("교육가능시수를 입력해주세요.");
+			}
+		}		
+
+		//교육설정 등록여부 체크
+		function fncLctrRsrchReg(){
+			
+			if(createForm.rsrchStrtDt.value > createForm.rsrchEndDt.value){
+				alert("시작일은 종료일보다 작아야합니다.");
+				return;
+			}
+			
+			if(createForm.rsrchStrtDt.value ==""){
+				alert("조사시작일을 넣어주세요");
+				return;
+			}
+			
+			if(createForm.rsrchEndDt.value ==""){
+				alert("조사마감일을 넣어주세요");
+				return;
+			}
+			
+			//var p_rgstrPsblTm 	= $(thisObj).closest("td").find("input[name=rgstrPsblTm]").val();	
+			//var p_stngYr 		= $("#stngYr").val();
+			//var p_prdDivCd 		= $("#prdDivCd").val();
+			//var p_instrDiv 		= $("input[name=instrDiv]").val();
+			//var p_areaCd	 	= $(thisObj).closest("tr").find("input[name=checkList]").val();
+			
+			//alert(p_areaCd);
+			
+			if(confirm("강의조사 일정을 등록하시겠습니까?")){
+				//동일한 값은 업데이트로 수정
+				$.ajax({
+					type:"POST",
+					url: "${pageContext.request.contextPath}/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/lctrRsrchMngRegAjax.do",
+					data:{
+						"rsrchInstrDiv"		:  "10",
+						"stngYrMnt"		:  $("select[name=p_stngYr]").val()+$("select[name=p_stngMnt]").val(),
+						"rsrchStrtDt"		:  $("input[name=rsrchStrtDt]").val(),
+						"rsrchEndDt"		:  $("input[name=rsrchEndDt]").val(),
+						},
+					dataType:'json',
+					
+					//async: false,
+					//processData: false,
+					//contentType: false,
+					cache: false,					
+					
+					success:function(returnData){
+						if(returnData.result == "success"){
+							alert("등록 되었습니다.");	
+							location.reload();
+							top.window.opener.location.reload();
+							
+						}else if(returnData.result == "already"){
+							alert("중복되는 날짜가 등록 되어있습니다.");	
+							//location.reload();
+							
+						}else{
+							alert("등록 중 오류가 발생하였습니다.");
+						}						
+					},
+					error:function(request , status, error){
+						alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+					}
+				});
+			}
+		}					
+	</script>
+</head>
+<body>
+	<!-- 팝업을 위한 mask -->
+	<div class="mask2" onclick="timeLayerUtil()"></div>
+
+	
+	
+	<div class="area_popup">
+
+			<!-- cont_tit -->
+			<div class="cont_tit">
+				<h2>강의조사요청관리</h2>
+			</div>
+			<!-- //cont_tit -->
+	
+		<div class="cont_popup">
+		
+<form:form id="createForm" name="createForm" method="post" commandName="vELctrDetailVO" onsubmit="return false;">
+<input type="hidden" name="instrDiv" id="instrDiv" value="<c:out value="${vELctrDetailVO.instrDiv}" />">
+<input type="hidden" name="areaCd" id="areaCd" value="<c:out value="${vELctrDetailVO.areaCd}" />">		
+<input type="hidden" name="stngYr" id="stngYr" value="<c:out value="${vELctrDetailVO.stngYr}" />">
+<input type="hidden" name="stngMnt" id="stngMnt" value="<c:out value="${vELctrDetailVO.stngMnt}" />">
+<input type="hidden" name="stngYrMnt" id="stngYrMnt" value="<c:out value="${vELctrDetailVO.stngYrMnt}" />">
+<input type="hidden" name="prdDivCd" id="prdDivCd" value="<c:out value="${vELctrDetailVO.prdDivCd}" />">	
+		
+
+
+			<table class="pop_tb_type02">
+				<colgroup>
+					<col style="width: 140px;">
+					<col style="width: auto;">
+				</colgroup>
+				<tbody>
+							<tr>
+								<th scope="row" colspan="2">
+									<p class="req_text"><span>필수입력 항목</span></p>
+									<p>
+											
+							<select class="sel_type1" name="p_stngYr" id="p_stngYr" title="줄 선택" style="width: 140px">
+							
+								<c:forEach var="list" items="${selectStngYrList}" varStatus="status">
+									<c:if test="${list.useYn eq '1'}">
+										<option value='${list.stngYr}' selected>${list.stngYr*1}년</option>
+									</c:if>
+									<c:if test="${list.useYn ne '1'}">
+										<option value='${list.stngYr}'>${list.stngYr*1}년</option>
+									</c:if>																		
+								</c:forEach>							
+							
+							</select>																		
+												
+							<select class="sel_type1" name="p_stngMnt" id="p_stngMnt" title="줄 선택" style="width: 140px">
+							
+								<c:forEach var="list" items="${selectStngMntList}" varStatus="status">
+								${list.useYn}
+									<c:if test="${list.useYn eq '1'}">
+										<option value='${list.stngMnt}' selected>${list.stngMnt}월</option>
+									</c:if>
+									<c:if test="${list.useYn ne '1'}">
+										<option value='${list.stngMnt}'>${list.stngMnt}월</option>
+									</c:if>								
+																		
+								</c:forEach>							
+							
+							</select>													
+												
+										<button class="btn_type08" onclick="fncGoList(); return false;" style="width: 140px;height:30px;">검색</button>									
+									
+									</p>
+								</th>
+								<!-- 
+								<td>
+									<div class="util_right">
+										&nbsp;&nbsp;&nbsp;년도&nbsp;&nbsp;
+										<kc:select codeId="VE0029" name="yr" id="yr" css="class='sel_type1'" 
+												selectedValue="${vEAStngVO.yr}" 
+												/>
+										<button class="btn_type08" onclick="fncGoList(); return false;">검색</button>
+										
+									</div>
+								</td>
+								 -->
+							</tr>
+				</tbody>
+			</table>
+			
+			<c:if test="${vELctrDetailVO.stngYrMnt ne ''}">
+			<script>
+				$("#p_stngYr").val('${vELctrDetailVO.stngYr}');
+				$("#p_stngMnt").val('${vELctrDetailVO.stngMnt}');
+			</script>
+
+			<table class="pop_tb_type02">
+				<colgroup>					
+					<col style="width: 21%;">
+					<col style="width: 33%;">
+					<col style="width: 33%;">
+					<col style="width: 15%;">
+				</colgroup>
+				<tbody>
+					<tr>
+						<th scope="row"></th>
+						<th scope="row">조사시작일</th>
+						<th scope="row">조사마감일</th>
+						<th scope="row">관리</th>
+					</tr>
+				</tbody>
+				<tbody>
+							<tr>
+								<!-- 회차 -->
+								<td>
+									<div class="util_right">
+										<c:out value="${vELctrDetailVO.stngYr}" />년
+										<c:out value="${vELctrDetailVO.stngMnt}" />월
+									</div>
+											
+								</td>
+								<td>
+									<div class="util_right">									
+										<div class="calendar_wrap">
+											<input type="text" class="calendar" title="시작일 선택" id="rsrchStrtDt" 
+											name="rsrchStrtDt" value="<c:out value="${selectVELctrDetailVO.rsrchStrtDt}" />">
+										</div>
+									</div>
+								</td>
+								<td>
+									<div class="util_right">
+									
+										<div class="calendar_wrap">
+											<input type="text" class="calendar" title="종료일 선택" id="rsrchEndDt" 
+											name="rsrchEndDt" value="<c:out value="${selectVELctrDetailVO.rsrchEndDt}" />">
+										</div>
+
+									</div>
+								</td>
+								<td>
+									<div class="btn_wrap_pop btn_layout01" style="margin-top:10px;margin-bottom:10px;">
+										<div class="btn_center" style="width: 100%;">
+											<button class="btn_type04" onclick="fncLctrRsrchReg(this); return false;">저장</button>											
+										</div>
+									</div>
+								</td>																								
+							</tr>
+				</tbody>
+			</table>
+					
+			
+			</c:if>
+
+
+			
+</form:form>			
+			
+			
+				<div class="btn_wrap_pop btn_layout01">
+					<div class="btn_left">
+					</div>
+					<div class="btn_center" style="width: 100%;">
+<!-- 						<button type="button" class="btn_type04" onclick="fncAprooval(); return false;">확인</button> -->
+						<button type="button" class="btn_type02" onclick="window.close()">취소</button>
+					</div>
+					<div class="btn_right">
+					</div>
+				</div>
+
+		</div>
+			
+		
+</div>
+
+</body>
+</html>
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advRndsStngMngPopup.jsp
@ -9,8 +9,8 @@
 <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
 <%
 	/**
-	 * @Class Name : advRndsStngMngPopup.jsp
-	 * @Description : 강의회차관리 팝업
+	 * @Class Name : advLctrRsrchStngMngPopup.jsp
+	 * @Description : 강의조사관리 팝업
 	 * @Modification Information
 	 * @
 	 * @  수정일      수정자          수정내용