2023-07-28 14:04 강의 설정 내용 수정 - ori에는 개별적으로 적용했음

src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrAreaService.java

@@ -24,10 +24,15 @@ public interface VELctrAreaService {
 	//D
 	int deleteAll(VELctrDetailVO paramVO) throws Exception;
 	
+	int deleteStngAll(VELctrDetailVO paramVO) throws Exception;
+	
 	//L
 	List<VELctrDetailVO> selectList(VELctrDetailVO paramVO) throws Exception;
 	
 	//Page List
 	List<VELctrDetailVO> selectPagingList(VELctrDetailVO paramVO) throws Exception;
 	
+	//조사년월에 강사가 선택한 강의지역 리스트로 변경. 2023-07-25
+	List<VELctrDetailVO> selectPagingListNew(VELctrDetailVO paramVO) throws Exception;
+	
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/VELctrRsrchSbmtService.java

@@ -10,6 +10,9 @@ public interface VELctrRsrchSbmtService {
 	//R
 	VELctrDetailVO selectDetail(VELctrDetailVO paramVO) throws Exception;
 	
+	//강의설정순번 없이 강의조사제출 정보가 있는지 찾는다로 수정. 2023-07-25
+	VELctrDetailVO selectDetailNew(VELctrDetailVO paramVO) throws Exception;
+
 	//U
 	int update(VELctrDetailVO paramVO) throws Exception;
 	

src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaDAO.java

@@ -63,6 +63,10 @@ public class VELctrAreaDAO extends EgovAbstractDAO {
 		return delete("VELctrAreaDAO.deleteAll", paramVO);		
 	}
 	
+	public int deleteStngAll(VELctrDetailVO paramVO) throws Exception {
+		return delete("VELctrAreaDAO.deleteStngAll", paramVO);		
+	}
+	
 	/**
 	 * 
 	 * 삭제 - D , 해당 유저의 강의에 대한 지역을 모두 삭제
@@ -91,4 +95,9 @@ public class VELctrAreaDAO extends EgovAbstractDAO {
 		return tlist;
 	}
 	
+	public List<VELctrDetailVO> selectPagingListNew(VELctrDetailVO paramVO) throws Exception {
+		List<VELctrDetailVO> tlist = (List<VELctrDetailVO>) list("VELctrAreaDAO.selectPagingListNew", paramVO);
+		return tlist;
+	}	
+	
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrAreaServiceImpl.java

@@ -49,6 +49,10 @@ public class VELctrAreaServiceImpl implements VELctrAreaService {
 		return  vELctrAreaDAO.deleteAll(paramVO);
 	}	
 	
+	public int deleteStngAll(VELctrDetailVO paramVO) throws Exception{
+		return  vELctrAreaDAO.deleteStngAll(paramVO);
+	}	
+	
 	//D
 	public int deleteLctrOrdArea(VELctrDetailVO paramVO) throws Exception{
 		return  vELctrAreaDAO.deleteLctrOrdArea(paramVO);
@@ -64,4 +68,7 @@ public class VELctrAreaServiceImpl implements VELctrAreaService {
 		return vELctrAreaDAO.selectPagingList(paramVO);
 	}
 	
+	public List<VELctrDetailVO> selectPagingListNew(VELctrDetailVO paramVO) throws Exception{
+		return vELctrAreaDAO.selectPagingListNew(paramVO);
+	}
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchSbmtDAO.java

@@ -29,6 +29,10 @@ public class VELctrRsrchSbmtDAO extends EgovAbstractDAO {
 		return (VELctrDetailVO) select("VELctrRsrchSbmtDAO.selectDetail", paramVO);
 	}
 	
+	public VELctrDetailVO selectDetailNew(VELctrDetailVO paramVO) throws Exception {
+		return (VELctrDetailVO) select("VELctrRsrchSbmtDAO.selectDetailNew", paramVO);
+	}
+	
 	/**
 	 * 수정 - U
 	 * @param VELctrDetailVO

src/main/java/kcc/ve/instr/tngrVisitEdu/lctrInfo/service/impl/VELctrRsrchSbmtServiceImpl.java

@@ -28,6 +28,10 @@ public class VELctrRsrchSbmtServiceImpl implements VELctrRsrchSbmtService {
 		return vELctrRsrchSbmtDAO.selectDetail(paramVO);
 	}
 	
+	public VELctrDetailVO selectDetailNew(VELctrDetailVO paramVO) throws Exception {
+		return vELctrRsrchSbmtDAO.selectDetailNew(paramVO);
+	}
+	
 	//U
 	public int update(VELctrDetailVO paramVO) throws Exception{
 		

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

@@ -140,6 +140,179 @@ public class lctrTngrInfoStngController {
         
         model.addAttribute("info", vELctrDetailVO);
         
+        /*		
+		// 선호대상 공통코드 조회
+		List<?> prfrnTrgtList = cmmUseService.selectCmmCodeDetail("VE0006");
+		model.addAttribute("prfrnTrgtList", prfrnTrgtList);
+		*/
+
+		//1.강의 조사를 요청한 설정 년월 리스트 - 
+        //조사년월 select box
+		List<VELctrDetailVO> selectStngYrMntList = vELctrRsrchMngService.selectList(vELctrDetailVO);
+		model.addAttribute("selectStngYrMntList", selectStngYrMntList);
+		
+        //2.오늘이 선택해서 들어온 강의조사의 기간 여부 체크
+		//날짜 표시 및 제출 버튼 노출 에 사용
+        VELctrDetailVO vELctrRsrchDetailVO = new VELctrDetailVO();
+        vELctrDetailVO.setSelectPagingListQuery("	AND	TO_CHAR(SYSDATETIME,'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);
+        vELctrRsrchDetailVO = vELctrRsrchMngService.selectDetailWithQuery(vELctrDetailVO);
+        model.addAttribute("vELctrRsrchDetailVO", vELctrRsrchDetailVO);
+        
+        
+        //3.강의지역 조회
+        //1depth 강의 지역 정보
+        VERsdncVO vERsdncVO = new VERsdncVO();
+		List<VERsdncVO> rsdncStep1VOList = vERsdncMIXService.selectRsdncStep1List(vERsdncVO);
+		model.addAttribute("rsdncStep1VOList", rsdncStep1VOList);
+		
+		/*
+		if(vELctrRsrchDetailVO==null) {	//현재 조사중이 아닌 조사년월값이다.	-	데이터 보여줌			
+			//현재의 선택값을 보여준다.
+			//2depth 강의 지역 정보 & 선택 여부
+			vERsdncVO.setUserId(vELctrDetailVO.getUserId());
+			vERsdncVO.setSiteNm(vELctrDetailVO.getStngYrMnt());
+			List<VERsdncVO> rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO);
+			model.addAttribute("rsdncStep2VOList", rsdncStep2VOList);
+			
+			
+		}else {	//제출한 정보를 보여준다.
+			//2depth 강의 지역 정보 & 선택 여부
+			vERsdncVO.setUserId(vELctrDetailVO.getUserId());
+			vERsdncVO.setSiteNm(vELctrDetailVO.getStngYrMnt());
+			List<VERsdncVO> rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2ListNew(vERsdncVO);
+			model.addAttribute("rsdncStep2VOList", rsdncStep2VOList);
+			
+		}
+		*/
+
+		//2depth 강의 지역 정보 & 선택 여부
+		vERsdncVO.setUserId(vELctrDetailVO.getUserId());
+		vERsdncVO.setSiteNm(vELctrDetailVO.getStngYrMnt());
+		List<VERsdncVO> rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2ListNew(vERsdncVO);
+		model.addAttribute("rsdncStep2VOList", rsdncStep2VOList);
+		
+		
+        //4.해당 강의 조사에 대한 강사의 작성한 정보가 있는지 확인 할것
+        vELctrDetailVO	=	vELctrRsrchSbmtService.selectDetailNew(vELctrDetailVO);
+
+        
+        //4.있으면 해당 값을 가져오기
+        if (vELctrDetailVO !=null) {
+        	//제출 정보 
+        	model.addAttribute("vELctrDetailVOSbmt", vELctrDetailVO);
+        	
+        	System.out.println("selectStngYrMntList.get(0).getStngMnt()= != null");
+        	System.out.println(selectStngYrMntList.get(0).getStngYrMnt());
+        	
+        	
+        	//vELctrDetailVO.setStngYrMnt(selectStngYrMntList.get(0).getStngYrMnt());
+        	
+            //강사상세
+        	/*
+            VEInstrDetailVO vEInstrDetailVODetail = new VEInstrDetailVO();
+            //vEInstrDetailVODetail.setInstrDiv(vELctrDetailVO.getInstrDiv());
+            vEInstrDetailVODetail.setInstrDiv(vELctrDetailVO.getInstrDiv());
+            vEInstrDetailVODetail.setUserId(vELctrDetailVO.getUserId());
+            vEInstrDetailVODetail.setUseYn("Y");
+            vEInstrDetailVODetail = vEInstrDetailService.selectDetail(vEInstrDetailVODetail);
+            model.addAttribute("vEInstrDetailVODetail", vEInstrDetailVODetail);
+            */
+            
+            
+    		//강의설정테이블
+    		VELctrDetailVO  lctrStngInfo = vELctrMIXService.selectDetail(vELctrDetailVO);    		
+    		
+    		if (lctrStngInfo!=null) {
+    			//강의 설정
+    			model.addAttribute("lctrStngInfo", lctrStngInfo);
+    			
+    			//강의지역 조회
+    			vELctrDetailVO.setRecordCountPerPage(1000);
+    			vELctrDetailVO.setFirstIndex(0);
+    			List<VELctrDetailVO> vELctrAreaList = vELctrAreaService.selectPagingListNew(vELctrDetailVO);
+    			model.addAttribute("vELctrAreaList", vELctrAreaList);    			
+    		}
+
+        }else {            
+        	//제출 정보 
+        	model.addAttribute("vELctrDetailVOSbmt", vELctrDetailVO);
+
+        	System.out.println("selectStngYrMntList.get(0).getStngMnt()== null");
+        	System.out.println(selectStngYrMntList.get(0).getStngYrMnt());
+        	
+        	//없으면 현재 값을 가져오기
+        	vELctrDetailVO	=	new VELctrDetailVO();
+            vELctrDetailVO.setInstrDiv(vEInstrDetailVO.getInstrDiv()); //강사구분 10-청소년 20-성인대상
+            vELctrDetailVO.setUserId(vEInstrDetailVO.getUserId());
+            vELctrDetailVO.setUserId(loginVO.getUniqId());
+            vELctrDetailVO.setStngYrMnt(selectStngYrMntList.get(0).getStngYrMnt());
+        	
+            //강사상세
+            /*
+            VEInstrDetailVO vEInstrDetailVODetail = new VEInstrDetailVO();
+            //vEInstrDetailVODetail.setInstrDiv(vELctrDetailVO.getInstrDiv());
+            vEInstrDetailVODetail.setInstrDiv(vELctrDetailVO.getInstrDiv());
+            vEInstrDetailVODetail.setUserId(vELctrDetailVO.getUserId());
+            vEInstrDetailVODetail.setUseYn("Y");
+            vEInstrDetailVODetail = vEInstrDetailService.selectDetail(vEInstrDetailVODetail);
+            model.addAttribute("vEInstrDetailVODetail", vEInstrDetailVODetail);
+            */
+            
+            //해당 월에 기 설정된 값이 없으면 데이터를 가져오지 않는다.
+            /*
+    		//강의설정테이블-사용중인
+            vELctrDetailVO.setUseYn("Y");
+    		VELctrDetailVO  lctrStngInfo = vELctrMIXService.selectDetail(vELctrDetailVO);    		
+    		
+    		if (lctrStngInfo!=null) {
+    			//강의 설정
+    			model.addAttribute("lctrStngInfo", lctrStngInfo);
+    			
+    			//강의지역 조회
+    			vELctrDetailVO.setRecordCountPerPage(1000);
+    			vELctrDetailVO.setFirstIndex(0);
+    			List<VELctrDetailVO> vELctrAreaList = vELctrAreaService.selectPagingList(vELctrDetailVO);
+    			model.addAttribute("vELctrAreaList", vELctrAreaList);    			
+    		} 
+    		*/                         	
+        }
+		
+		
+		return "/web/ve/instr/tngrVisitEdu/lctrInfo/lctrStngReg";
+	}
+	
+	/**
+	 * 1.성인대상 강사 강의설정 등록화면
+	 */
+	@RequestMapping("lctrStngReg_bak.do")	
+	public String instrPrflReg_bak(
+			@ModelAttribute("vELctrDetailVO") VELctrDetailVO vELctrDetailVO
+			,@ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO			
+			, ModelMap model
+			, HttpServletRequest request
+			) throws Exception {
+		
+		//로그인 처리====================================
+		//로그인 정보 가져오기
+		
+        LoginVO loginVO = checkLoginUtil.getAuthLoginVO();				//권한에 따른 로그인 정보 가져오기
+        SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request);	//SSO 로그인 정보 가져오기
+        
+        if (loginVO == null || ssoLoginVO == null) {
+        	return checkLoginUtil.getUserLoginPage(model);	//로그인 정보가 없으면 로그인 페이지로 이동한다.
+        }
+		//로그인 처리====================================      
+                
+        //청소년대상 강사 정보 가져오기
+        vELctrDetailVO.setInstrDiv(vEInstrDetailVO.getInstrDiv()); //강사구분 10-청소년 20-성인대상
+        vELctrDetailVO.setUserId(vEInstrDetailVO.getUserId());
+        vELctrDetailVO.setUserId(loginVO.getUniqId());        
+        
+        model.addAttribute("info", vELctrDetailVO);
+        
         
         //강의지역 조회
         VERsdncVO vERsdncVO = new VERsdncVO();

src/main/java/kcc/ve/instr/tngrVisitEdu/rsdncInfo/service/VERsdncMIXService.java

@@ -9,8 +9,15 @@ public interface VERsdncMIXService {
 	
 	List<VERsdncVO> selectRsdncStep1List(VERsdncVO paramVO) throws Exception;
 	
+	//강사의 모든 강의 조사 선택 강의 지역 정보로 사용했음
 	List<VERsdncVO> selectRsdncStep2List(VERsdncVO paramVO) throws Exception;
 	
+	//강사의 해당 년월의 강의 조사 선택 강의 지역 정보로 사용하도록 수정 - 2023.07.25
+	List<VERsdncVO> selectRsdncStep2ListNew(VERsdncVO paramVO) throws Exception;
+
+	//강사의 강의 지역 정보를 사용중인 정보고 가져오기 - 2023.07.26
+	List<VERsdncVO> selectRsdncStep2ListNewAdmin(VERsdncVO paramVO) throws Exception;
+	
 	List<VERsdncVO> selectRsdncStep3List(VERsdncVO paramVO) throws Exception;
 	
 }

src/main/java/kcc/ve/instr/tngrVisitEdu/rsdncInfo/service/impl/VERsdncMIXDAO.java

@@ -26,6 +26,16 @@ public class VERsdncMIXDAO extends EgovAbstractDAO {
 		return tlist;
 	}
 	
+	public List<VERsdncVO> selectRsdncStep2ListNew(VERsdncVO paramVO) throws Exception {
+		List<VERsdncVO> tlist = (List<VERsdncVO>) list("VERsdncMIXDAO.selectRsdncStep2ListNew", paramVO);
+		return tlist;
+	}
+	
+	public List<VERsdncVO> selectRsdncStep2ListNewAdmin(VERsdncVO paramVO) throws Exception {
+		List<VERsdncVO> tlist = (List<VERsdncVO>) list("VERsdncMIXDAO.selectRsdncStep2ListNewAdmin", paramVO);
+		return tlist;
+	}
+	
 	public List<VERsdncVO> selectRsdncStep3List(VERsdncVO paramVO) throws Exception {
 		List<VERsdncVO> tlist = (List<VERsdncVO>) list("VERsdncMIXDAO.selectRsdncStep3List", paramVO);
 		return tlist;

src/main/java/kcc/ve/instr/tngrVisitEdu/rsdncInfo/service/impl/VERsdncMIXServiceImpl.java

@@ -31,6 +31,14 @@ public class VERsdncMIXServiceImpl implements VERsdncMIXService {
 		return vERsdncMIXDAO.selectRsdncStep2List(paramVO);
 	}
 
+	public List<VERsdncVO> selectRsdncStep2ListNew(VERsdncVO paramVO) throws Exception{
+		return vERsdncMIXDAO.selectRsdncStep2ListNew(paramVO);
+	}
+	
+	public List<VERsdncVO> selectRsdncStep2ListNewAdmin(VERsdncVO paramVO) throws Exception{
+		return vERsdncMIXDAO.selectRsdncStep2ListNewAdmin(paramVO);
+	}
+	
 	public List<VERsdncVO> selectRsdncStep3List(VERsdncVO paramVO) throws Exception{
 		return vERsdncMIXDAO.selectRsdncStep3List(paramVO);
 	}

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

@@ -1780,7 +1780,8 @@ public class OprtnInstrTngrPrflContoller {
 			List<VERsdncVO> rsdncStep1VOList = vERsdncMIXService.selectRsdncStep1List(vERsdncVO);
 			model.addAttribute("rsdncStep1VOList", rsdncStep1VOList);
 			
-			List<VERsdncVO> rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO);
+			//List<VERsdncVO> rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO);
+			List<VERsdncVO> rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2ListNew(vERsdncVO);
 			model.addAttribute("rsdncStep2VOList", rsdncStep2VOList);
 			
 			// 선호대상 공통코드 조회
@@ -1835,7 +1836,7 @@ public class OprtnInstrTngrPrflContoller {
 	    			//강의지역 조회
 	    			vELctrDetailVO.setRecordCountPerPage(1000);
 	    			vELctrDetailVO.setFirstIndex(0);
-	    			List<VELctrDetailVO> vELctrAreaList = vELctrAreaService.selectPagingList(vELctrDetailVO);
+	    			List<VELctrDetailVO> vELctrAreaList = vELctrAreaService.selectPagingListNew(vELctrDetailVO);
 	    			model.addAttribute("vELctrAreaList", vELctrAreaList);    			
 	    		}
 
@@ -1863,14 +1864,26 @@ public class OprtnInstrTngrPrflContoller {
 			//로그인 처리====================================  
 			
 			//강의지역 조회
+			//depth1
 	        VERsdncVO vERsdncVO = new VERsdncVO();
 	        System.out.println("List<VERsdncVO> rsdncStep1VOList = vERsdncMIXService.selectRsdncStep1List(vERsdncVO);");
 			List<VERsdncVO> rsdncStep1VOList = vERsdncMIXService.selectRsdncStep1List(vERsdncVO);
 			model.addAttribute("rsdncStep1VOList", rsdncStep1VOList);
 			
+			//depth2
 			System.out.println("List<VERsdncVO> rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO);");
+			System.out.println("List<VERsdncVO> rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2ListNewAdmin(vERsdncVO);=2");
 			vERsdncVO.setUserId(vELctrDetailVO.getUserId());			
-			List<VERsdncVO> rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO);
+			//List<VERsdncVO> rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO);
+			
+			System.out.println("vERsdncVO.getUserId()");
+			System.out.println(vERsdncVO.getUserId());
+			
+			if ("".equals(vERsdncVO.getUserId()) || vERsdncVO.getUserId()==null) {
+				vERsdncVO.setUserId(vELctrDetailVO.getUserId());	
+			}
+			
+			List<VERsdncVO> rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2ListNewAdmin(vERsdncVO);
 			model.addAttribute("rsdncStep2VOList", rsdncStep2VOList);
 			
 			//강의설정테이블
@@ -1926,7 +1939,8 @@ public class OprtnInstrTngrPrflContoller {
 			model.addAttribute("rsdncStep1VOList", rsdncStep1VOList);
 			
 			vERsdncVO.setUserId(vELctrDetailVO.getUserId());
-			List<VERsdncVO> rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2List(vERsdncVO);
+			vERsdncVO.setSiteNm(vELctrDetailVO.getStngYrMnt());
+			List<VERsdncVO> rsdncStep2VOList = vERsdncMIXService.selectRsdncStep2ListNew(vERsdncVO);
 			model.addAttribute("rsdncStep2VOList", rsdncStep2VOList);
 			
 			// 선호대상 공통코드 조회
@@ -1975,7 +1989,7 @@ public class OprtnInstrTngrPrflContoller {
 	    			//강의지역 조회
 	    			vELctrDetailVO.setRecordCountPerPage(1000);
 	    			vELctrDetailVO.setFirstIndex(0);
-	    			List<VELctrDetailVO> vELctrAreaList = vELctrAreaService.selectPagingList(vELctrDetailVO);
+	    			List<VELctrDetailVO> vELctrAreaList = vELctrAreaService.selectPagingListNew(vELctrDetailVO);
 	    			model.addAttribute("vELctrAreaList", vELctrAreaList);    			
 	    		}
 
@@ -2144,7 +2158,11 @@ public class OprtnInstrTngrPrflContoller {
 			}
 			
 			//강의지역테이블 새로 Insert
-			vELctrAreaService.deleteAll(vELctrDetailVO);
+			//기존 지역을 삭제하지 않는다.since.2023.07.26
+			//vELctrAreaService.deleteAll(vELctrDetailVO);
+			//해당 조사년월에 대한 지역만 삭제한다.
+			vELctrAreaService.deleteStngAll(vELctrDetailVO);
+			
 			if(StringUtil.isNotEmpty(vELctrDetailVO.getAreaCd())) {
 				String[] areaCdArr = vELctrDetailVO.getAreaCd().split(",");
 				for(String areaCd : areaCdArr) {

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

@@ -122,6 +122,23 @@
 		   AND user_id	= #userId#
 	</delete>
 
+	<!-- 강의 지역 D -->
+	<delete id="VELctrAreaDAO.deleteStngAll" parameterClass="VELctrDetailVO">
+		DELETE FROM 
+			<include refid="VELctrAreaDAO.table_name"/>
+		WHERE
+		   instr_div	= #instrDiv#
+		   AND user_id	= #userId#
+		   AND lctr_stng_ord=(
+								SELECT lctr_stng_ord
+								FROM ve_lctr_rsrch_sbmt a
+								WHERE   a.rsrch_instr_div	=#instrDiv#
+									AND     a.stng_yr_mnt   =#stngYrMnt#
+								  	AND     a.user_id       =#userId#
+								  	AND     a.instr_div     =#instrDiv#		   
+		   					)
+	</delete>
+		
 	<!-- 강의 설정 강의 지역 D -->
 	<delete id="VELctrAreaDAO.deleteLctrOrdArea" parameterClass="VELctrDetailVO">
 		DELETE FROM 
@@ -192,4 +209,53 @@
 					
 	</select>			 
 
+	<!-- 강사 정보 L page -->
+	<select id="VELctrAreaDAO.selectPagingListNew" parameterClass="VELctrDetailVO" resultClass="VELctrDetailVO">
+	/*	//조사년월에 강사가 선택한 강의지역 리스트로 변경. 2023-07-25	*/
+		SELECT   COUNT(1) OVER() AS totCnt ,
+		         c.instr_div     AS instrDiv,
+		         c.user_id       AS userId,
+		         c.lctr_stng_ord AS lctrStngOrd,
+		         c.lctr_area_ord AS lctrAreaOrd,
+		         c.area_cd       AS areaCd ,
+		         c.area_nmbr     AS areaNmbr
+        FROM    ve_lctr_rsrch_mng a ,
+                ve_lctr_rsrch_sbmt b ,
+                ve_lctr_area c
+
+        WHERE	1=1
+        
+        		AND     a.stng_yr_mnt    =b.stng_yr_mnt
+        		AND     b.instr_div      =c.instr_div
+        		AND     b.user_id        =c.user_id
+        		AND     b.lctr_stng_ord  =c.lctr_stng_ord
+
+		<isNotEmpty property="stngYrMnt">
+			AND a.stng_yr_mnt=#stngYrMnt#
+		</isNotEmpty>
+		        
+		<isNotEmpty property="userId">
+			AND b.user_id=#userId#
+		</isNotEmpty>
+		
+		<isNotEmpty property="instrDiv">
+			AND a.rsrch_instr_div=#instrDiv#
+			AND b.instr_div=#instrDiv#
+		</isNotEmpty>
+		
+			
+				
+		ORDER BY 1=1					
+			
+		<isEmpty property="orderByQuery">
+			, b.user_id desc
+		</isEmpty>
+		<isNotEmpty property="orderByQuery">
+			, $orderByQuery$
+		</isNotEmpty>
+		
+				
+		LIMIT #recordCountPerPage# OFFSET #firstIndex#
+					
+	</select>	
 </sqlMap>

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

@@ -85,11 +85,12 @@
 	
 	<!-- 강사 정보 R -->
 	<select id="VELctrRsrchSbmtDAO.selectDetail" parameterClass="VELctrDetailVO" resultClass="VELctrDetailVO">
-	/*	해당 강의 조사 기간에 대해 강사가 작성한 정보가 있는지 확인	*/
+	/*	해당 강의 조사 기간에 대해 강사가 작성한 정보가 있는지 확인 - 관리자	*/
 		SELECT
 			<include refid="VELctrRsrchSbmtDAO.select_column_name"/>			
 		FROM 
 			<include refid="VELctrRsrchSbmtDAO.table_name"/> a
+			, ve_lctr_stng b			
 		WHERE
 		   a.rsrch_instr_div	= #rsrchInstrDiv#
 		   AND a.stng_yr_mnt		= #stngYrMnt#
@@ -101,6 +102,27 @@
 			AND a.lctr_stng_ord	=	#lctrStngOrd#
 			
 		</isNotEmpty>
+			AND a.instr_div=b.instr_div
+			AND a.user_id=b.user_id
+			AND a.lctr_stng_ord=b.lctr_stng_ord
+			AND b.sbmt_yn='Y'
+		   
+	</select>
+
+	<!-- 강사 정보 R -->
+	<select id="VELctrRsrchSbmtDAO.selectDetailNew" parameterClass="VELctrDetailVO" resultClass="VELctrDetailVO">
+	/*	해당 강의 조사 기간에 대해 강사가 작성한 정보가 있는지 확인	*/
+	/*	순번데이터 없이 해당 조사 제출을 한 강사 정보가 있는지 확인 하는 것임 since 2023.07.25 	*/
+		SELECT
+			<include refid="VELctrRsrchSbmtDAO.select_column_name"/>
+		FROM 
+			<include refid="VELctrRsrchSbmtDAO.table_name"/> a
+		WHERE
+		   a.rsrch_instr_div	= #rsrchInstrDiv#
+		   AND a.stng_yr_mnt		= #stngYrMnt#
+		   
+		   AND a.instr_div	= #instrDiv#
+		   AND a.user_id	= #userId#		   
 		   
 	</select>
 			

src/main/resources/egovframework/sqlmap/ve/rsdnc/VERsdnc_MIX_SQL_Cubrid.xml

@@ -121,6 +121,148 @@
 					
 	</select>
 	
+	<!-- 거주지 2단계 -->
+	<!-- //강사의 해당 년월의 강의 조사 선택 강의 지역 정보로 사용하도록 수정 - 2023.07.25 -->	
+	<select id="VERsdncMIXDAO.selectRsdncStep2ListNew" parameterClass="VERsdncVO" resultClass="VERsdncVO">
+		/*	강의 지역	-	Depth 2	*/
+		SELECT aa.*
+			, IFNULL(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 
+						, MAX(post_id) postId
+					FROM ve_rsdnc a
+					WHERE 1=1
+					<isNotEmpty property="oneDepthNm">
+						AND a.one_depth_nm=#oneDepthNm#
+					</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)
+						/*
+							, 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)
+						/*
+							, a.two_depth_nm
+						*/			
+				)aa 
+		         LEFT OUTER JOIN 
+		         (
+		         /*
+							SELECT a.area_cd
+			                 	, one_depth_nm AS oneDepthNm 
+			                 	, two_depth_nm AS twoDepthNm
+			        FROM     ve_lctr_area a
+			        	, ve_rsdnc b
+			        WHERE    1          =1
+					        AND      a.user_id  =userId
+					        AND      a.instr_div='10'
+					        AND a.area_cd=b.post_id
+					        */
+					        
+						SELECT c.area_cd ,
+						       d.one_depth_nm AS oneDepthNm ,
+						       d.two_depth_nm AS twoDepthNm
+						FROM   ve_lctr_rsrch_mng a ,
+						       ve_lctr_rsrch_sbmt b ,       
+						       ve_lctr_area c ,
+						       ve_rsdnc d
+						WHERE  a.rsrch_instr_div='10'
+						AND    a.stng_yr_mnt    =#siteNm#
+						AND    b.user_id        =#userId#
+						AND    b.instr_div      ='10'
+						AND    a.stng_yr_mnt    =b.stng_yr_mnt
+						
+						AND b.instr_div=c.instr_div
+						AND b.user_id=c.user_id
+						AND b.lctr_stng_ord=c.lctr_stng_ord
+						
+						AND    c.area_cd  =d.post_id					        
+					                 
+		         )bb
+		         ON(
+		         	aa.postId=bb.area_cd
+		         	
+		         	OR (
+		         			aa.oneDepthNm=bb.oneDepthNm
+		         			AND aa.twoDepthNm=bb.twoDepthNm 
+		         		)
+		         )			
+	
+		WHERE TRIM(aa.twoDepthNm) !=''
+					
+	</select>
+		
+	<!-- 거주지 2단계 -->
+	<!-- //관리자에서 강사의 현재 선택 지역 정보를 가져오기 위한 쿼리임 - 2023.07.26 -->	
+	<select id="VERsdncMIXDAO.selectRsdncStep2ListNewAdmin" parameterClass="VERsdncVO" resultClass="VERsdncVO">
+		/*	강의 지역	-	Depth 2	*/
+		SELECT aa.*
+			, IFNULL(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 
+						, MAX(post_id) postId
+					FROM ve_rsdnc a
+					WHERE 1=1
+					<isNotEmpty property="oneDepthNm">
+						AND a.one_depth_nm=#oneDepthNm#
+					</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)
+						/*
+							, 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)
+						/*
+							, a.two_depth_nm
+						*/			
+				)aa 
+		         LEFT OUTER JOIN 
+		         (					        
+						SELECT c.area_cd ,
+						       d.one_depth_nm AS oneDepthNm ,
+						       d.two_depth_nm AS twoDepthNm
+						FROM   ve_lctr_stng a ,						              
+						       ve_lctr_area c ,
+						       ve_rsdnc d
+						WHERE  1=1
+						AND    a.user_id        =#userId#
+						AND    a.instr_div      ='10'
+						AND    a.use_yn='Y'
+						
+						AND 	a.instr_div=c.instr_div
+						AND 	a.user_id=c.user_id
+						AND 	a.lctr_stng_ord=c.lctr_stng_ord
+						
+						AND    c.area_cd  =d.post_id					        
+					                 
+		         )bb
+		         ON(
+		         	aa.postId=bb.area_cd
+		         	
+		         	OR (
+		         			aa.oneDepthNm=bb.oneDepthNm
+		         			AND aa.twoDepthNm=bb.twoDepthNm 
+		         		)
+		         )			
+	
+		WHERE TRIM(aa.twoDepthNm) !=''
+					
+	</select>
+			
 	<!-- 거주지 3단계 -->
 	<select id="VERsdncMIXDAO.selectRsdncStep3List" parameterClass="VERsdncVO" resultClass="VERsdncVO">
 		/*	강의 지역	-	Depth 3	*/

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

@@ -48,6 +48,12 @@ var ex_s_todate;// = info.startStr;
 			firstDay   : 0, //월요일이 먼저 오게 하려면 1
 			dayMaxEvents: true,
 			navLinks: true,		
+				
+			navLinkDayClick: function(date, jsEvent) {	//일자클릭
+			    console.log('day', date.toISOString());
+			    console.log('coords', jsEvent.pageX, jsEvent.pageY);
+			},
+			
 			customButtons: {
 				myCustomButton: {
 					text: '오늘',

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndList.jsp

@@ -56,6 +56,13 @@
 		<div class="list_top_left">
 		</div>
 		<div class="btn_wrap">
+		
+			<span class="cf_text" style="font-size: 16px; font-weight: 400; color: #e40000;line-height: 1.5;left-margin:5px;"
+			>※ 각종 서류 제출은 하단 목록을 클릭하셔서 운영내역    
+			<br/>&nbsp;&nbsp;&nbsp;&nbsp;상세페이지에서 제출해주시기 바랍니다.
+			<br/>&nbsp;&nbsp;&nbsp;&nbsp;('결과보고제출'버튼은 상세 페이지 하단에 있습니다)
+			</span>				
+		
 		<p style="padding-right:5px;font-weight:bold;">신청일 : ${vEEduAplctVO.searchEndSbmtPnttm}</p> 
 			<div class="calendar_wrap">
 				<%-- <input type="text" class="calendar" id="searchStartSbmtPnttm" name="searchStartSbmtPnttm" title="시작일 선택" value="${vEEduAplctVO.searchStartSbmtPnttm}"> --%>

src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmEnd/exprnClsrmEndRslt.jsp

@@ -626,6 +626,10 @@
 	<div class="tb_tit01">
 		<div class="tb_tit01_left">
 			<p>결과보고 정보</p>
+			<span class="cf_text" style="font-size: 16px; font-weight: 400; color: #e40000;line-height: 1.5;margin-left:100px;"
+			>※ 업로드 가능한 용량은 전체 파일을 합산한 기준으로 500MB 제한이 있습니다.
+			<br/>&nbsp;&nbsp;&nbsp;&nbsp;용량을 초과할 경우, 오류 발생으로 인해 업로드가 되지 않으니 유의하시기 바랍니다.			
+			</span>			
 		</div>
 	</div>
 	<div class="exprnClsrmEndRslt_wrap">