2023-10-31 17:48 청소년 지역설정 수정사항 수정

src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java

@@ -1143,6 +1143,7 @@ public class AdvAreaLctrMngTngrController {
     	vEAStngVO.setDpStrtDt(s_std_date);
     	vEAStngVO.setYr(s_std_date.substring(0,4));
     	//schduleManageVO.setSearchStartDt(schduleManageVO.getSearchStartDt().split("T")[0].replaceAll("-", ""));
+    	//step1.현재달력의 첫번째 날짜를 기준으로 그해와 다음해의 전체 일자를 만들고, 
     	
     	List<VEAStngVO>	vList	=	vEAStngMixService.selectList_VEALPPS_2(vEAStngVO);
     	

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

@@ -241,6 +241,7 @@
 			, eee.LCTR_PSBL_PRD_ORD
 			*/			
 		FROM (
+				/*	Step1.올해-내년의 달력을 만들고, 	*/
 				SELECT 
 					to_date(aa.yr_mnt_day_str,'YYYY-MM-DD')					AS datez
 					, to_char(to_date(aa.yr_mnt_day_str,'YYYY-MM-DD'),'d')	AS num_week
@@ -311,28 +312,34 @@
 				WHERE to_char(aa.yr_mnt_last_day,'YYYY.MM.DD')>=aa.yr_mnt_day_str
 			)aaa
 			
+			/*	Step2.개별적으로 할당된 일별 시수를 가져오고	*/
             LEFT OUTER JOIN vea_dt_psbl_tm_qntty_stng bbb
             on(
                  	aaa.datez_str=bbb.trgt_dt
-                 	AND bbb.yr=#yr#
+                 	/*
+                 	AND bbb.yr= yr 
+                 	*/
             )   
             
+            /*	Step3.신청 불가능 일자를 가져오고	*/
             LEFT OUTER JOIN vea_lctr_psbl_prd_stng ddd
             on(
 				ddd.LCTR_PSBL_YN ='N'
             	AND ddd.LCTR_PSBL_STRT_DT = aaa.datez_str
             )                             
             
+            /*	Step4.신청가능 기간을 가져오고	*/
             LEFT OUTER JOIN vea_lctr_psbl_prd_stng eee
             on(
 				aaa.datez_str BETWEEN eee.lctr_psbl_strt_dt AND eee.lctr_psbl_ddln_dt
 				AND eee.lctr_psbl_yn='Y'
             )               
             
+            /*	Step5.각 년도의 기본 시수를 가져온다.	*/
 			, vea_lctr_yr_stng ccc
 		WHERE 1=1
 			AND aaa.num_week in(2,3,4,5,6)
-			AND ccc.yr=#yr#
+			AND aaa.datez	LIKE ccc.yr||'%'
 			AND eee.LCTR_PSBL_PRD_ORD is not null
 		
 		ORDER BY aaa.datez		

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

@@ -227,10 +227,10 @@
 			//document.listForm.rndsOrd.value = p_rndsOrd;
 			
 		    //document.listForm.authorCode.value = vAuthorCode;
-		    document.listForm.action = "<c:url value='/kccadr/oprtn/tngrVisitEdu/popup/advPsblTmQnttyCalendarPopup.do'/>";
+		    document.popupForm.action = "<c:url value='/kccadr/oprtn/tngrVisitEdu/popup/advPsblTmQnttyCalendarPopup.do'/>";
 		    window.open("#", "_PsblTmQnttyPop", "scrollbars = no, top=100px, left=100px, height=1000px, width=1200px");    
-		    document.listForm.target = "_PsblTmQnttyPop";
+		    document.popupForm.target = "_PsblTmQnttyPop";
-		    document.listForm.submit();  
+		    document.popupForm.submit();  
 		}
 		
 		function fncDdlnState() { //메뉴생성 화면 호출
@@ -295,7 +295,7 @@
 			}
 			*/
 
-			var p_stngYr 		= $("#stngYr").val();
+			var p_stngYr 		= $("#listForm #stngYr").val();
 
 			if(p_stngYr==''){
 				alert("강의가능 시간 변경 대상 년도를 선택해주세요.");
@@ -313,7 +313,7 @@
 		function fncDupleCheck(thisObj){
 			var p_ttlEduCnfrmPsblChasi	= $(thisObj).closest("td").find("input[name=ttlEduCnfrmPsblChasi]").val();
 			//var p_rndsOrd 		= $("#rndsOrd").val();				
-			var p_rndsOrd 		= $("#stngYr").val();	//회차기준에서 년도 기준으로 변경함
+			var p_rndsOrd 		= $("#listForm #stngYr").val();	//회차기준에서 년도 기준으로 변경함
 			var p_areaCd	 	= $(thisObj).closest("tr").find("input[name=checkList]").val();
 			
 			//alert(p_areaCd);
@@ -352,7 +352,7 @@
 					type:"POST",
 					url:"${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/popup/areaLctrMngRgstrDtAjax.do",
 					data: {
-						"stngYr" : $("#stngYr").val() ,
+						"stngYr" : $("#listForm #stngYr").val() ,
 						"prdDivCd" : $("#prdDivCd").val() ,
 						"rgstrStrtDt" : $("#rgstrStrtDt").val() ,
 						"rgstrEndDt" : $("#rgstrEndDt").val() ,
@@ -374,7 +374,7 @@
 					type:"POST",
 					url:"${pageContext.request.contextPath}/kccadr/oprtn/tngrVisitEdu/popup/areaDeadLineDtAjax.do",
 					data: {
-						"stngYr" : $("#stngYr").val() ,
+						"stngYr" : $("#listForm #stngYr").val() ,
 						"prdDivCd" : $("#prdDivCd").val() ,
 						"deadlineDt" : $("#deadlineDt").val()
 					},
@@ -392,7 +392,7 @@
 		//교육가능시수 변경
 		function fncEduPsblTmSave(thisObj){
 			var p_psblTmQntty 	= $(thisObj).closest("td").find("input[name=psblTmQntty]").val();	
-			var p_stngYr 		= $("#stngYr").val();
+			var p_stngYr 		= $("#listForm #stngYr").val();
 			
 			//alert(p_areaCd);
 			
@@ -427,7 +427,7 @@
 
 			//회차관리 팝업
 		function fncRndsStng() {
-			var p_stngYr 		= $("#stngYr").val();
+			var p_stngYr 		= $("#listForm #stngYr").val();
 
 			if(p_stngYr==''){
 				alert("회차관리 대상 년도를 선택해주세요.");
@@ -449,7 +449,7 @@
 				alert("강의가능기간 대상 회차를 선택해주세요.");
 				return false;
 			}
-			var p_stngYr 		= $("#stngYr").val();
+			var p_stngYr 		= $("#listForm #stngYr").val();
 			document.listForm.yr.value = p_stngYr;
 			//document.listForm.rndsOrd.value = p_rndsOrd;
 			
@@ -538,6 +538,10 @@
 	<title>신청관리</title>
 </head>
 <body>
+<form id="popupForm" name="popupForm" method="post">
+	<input type="hidden" name="stngYr" id="stngYr" value=""/>
+</form>
+
 <form id="editForm" name="editForm" method="post">
 	<input type="hidden" name="mode" value=""/>
 	<input type="hidden" name="adrSeq" value=""/>