From 0f52196e7d00c43bd393e2096f237df1ae3c174b Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Tue, 24 Oct 2023 15:26:38 +0900
Subject: [PATCH] =?UTF-8?q?2023-10-24=2016:26=20=EC=B2=AD=EC=86=8C?=
 =?UTF-8?q?=EB=85=84=20=EA=B0=95=EC=9D=98=20=EC=84=A4=EC=A0=95=20=EB=A7=88?=
 =?UTF-8?q?=EB=AC=B4=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/AdvAreaLctrMngTngrController.java     |  9 +++++-
 .../web/AreaLctrMngTngrController.java        |  3 +-
 .../ve/tngr/VEALctrPsblPrdStng_SQL_Tibero.xml |  4 +++
 .../ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml   | 22 +++++++++++----
 .../oprtn/tngrVisitEdu/advAreaLctrMngList.jsp | 28 +++++++++++++++++--
 .../popup/advLctrPrdCalendarPopup.jsp         |  2 ++
 6 files changed, 59 insertions(+), 9 deletions(-)

diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java
index ff022d5d..0163633d 100644
--- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java
+++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AdvAreaLctrMngTngrController.java
@@ -239,6 +239,7 @@ public class AdvAreaLctrMngTngrController {
 	    	VEAStngVO	vEAStngVO	=	new VEAStngVO();
 	    	vEAStngVO.setYr(vELctrDetailVO.getStngYr());
 	    	vEAStngVO.setRndsOrd(vELctrDetailVO.getRndsOrd());
+	    	//vEAStngVO.setRndsOrd(vELctrDetailVO.getStngYr());
 	    	
 	    	
 			
@@ -1007,7 +1008,13 @@ public class AdvAreaLctrMngTngrController {
 	    	//List<VEAStngVO>	selectBasicList	=	vEAStngService.selectList_VEALPPS(vEAStngVO);
 	    	
 	    	//model.addAttribute("selectBasicList", selectBasicList);
-	    		    		        
+	    	
+	        System.out.println(vEAStngVO.getRndsOrd());
+	        System.out.println(vEAStngVO.getRndsOrd());
+	        
+	        model.addAttribute("rndsOrd", vEAStngVO.getRndsOrd());
+	        
+	        
 	        
 		}catch(Exception ex)
 		{
diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java
index 27305607..feabdfe1 100644
--- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java
+++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java
@@ -527,7 +527,8 @@ public class AreaLctrMngTngrController {
 	        VEAStngVO vEAStngVO	=	new VEAStngVO(); 
 	        
 	        //
-	        String s_rndsOrd	=	vELctrDetailVO.getLctrAreaOrd();	        	        
+	        //String s_rndsOrd	=	vELctrDetailVO.getLctrAreaOrd();	        	        
+	        String s_rndsOrd	=	vELctrDetailVO.getStngYr();
 	        String[] a_areaCd		=	request.getParameter("areaCd").split("_");
 	        
 	        String s_lctrPsblStrtT	=	request.getParameter("lctrPsblStrtTm");
diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrPsblPrdStng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrPsblPrdStng_SQL_Tibero.xml
index 874c4b66..9c596177 100644
--- a/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrPsblPrdStng_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrPsblPrdStng_SQL_Tibero.xml
@@ -226,6 +226,10 @@
 					OR #lctrPsblStrtDt#  BETWEEN a.LCTR_PSBL_STRT_DT AND a.LCTR_PSBL_DDLN_DT
 					OR #lctrPsblDdlnDt#  BETWEEN a.LCTR_PSBL_STRT_DT AND a.LCTR_PSBL_DDLN_DT
 				)
+				
+			<isNotEmpty property="rndsOrd">
+				AND a.rnds_ord=#rndsOrd#
+			</isNotEmpty>				
 					
 	</select>
 </sqlMap>
diff --git a/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml
index 18ad1795..9b04b18a 100644
--- a/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml
@@ -180,6 +180,9 @@
             on(
 				ddd.LCTR_PSBL_YN ='N'
             	AND ddd.LCTR_PSBL_STRT_DT = aaa.datez_str
+				<isNotEmpty property="rndsOrd">
+					AND ddd.rnds_ord 			= #rndsOrd#
+				</isNotEmpty>            	
             )   
 			,
 			(
@@ -195,13 +198,17 @@
 			AND aaa.datez_str BETWEEN ccc.lctr_psbl_strt_dt AND ccc.lctr_psbl_ddln_dt
 			AND ccc.lctr_psbl_yn='Y'
 		
+				<isNotEmpty property="rndsOrd">
+					AND ccc.rnds_ord 			= #rndsOrd#
+				</isNotEmpty>		
+		
 		ORDER BY aaa.datez		
         	
 	</select>
 	
 	<!-- 교육가능시수 달력 용 데이터  -->
 	<select id="VEALctrYrStngMixDAO.selectList_VEALPPS_2" parameterClass="VEAStngVO" resultClass="VEAStngVO">
-		/*	VEALctrYrStngMixDAO.selectList_VEALPPS_2	*/
+		/*	교육가능시수 달력 용 데이터	VEALctrYrStngMixDAO.selectList_VEALPPS_2	*/
 		/*
 		SELECT '가능일1' title
 			, '2023-09-01' "START"
@@ -216,7 +223,7 @@
 		FROM dual
 		*/
 		
-		SELECT aaa.datez "START"
+		SELECT DISTINCT aaa.datez "START"
 			, aaa.datez "END"
 			, 1 allDay			
 			
@@ -228,9 +235,11 @@
 					WHEN ddd.LCTR_PSBL_PRD_ORD IS NOT NULL THEN '불가능' 
 					WHEN bbb.DT_PSBL_TM_QNTTY_ORD IS NULL THEN to_char(ccc.psbl_tm_qntty)
 					ELSE to_char(bbb.PSBL_TM_QNTTY) 
-				END AS title		
+				END AS title
+				/*		
             , ddd.LCTR_PSBL_PRD_ORD
-			, eee.LCTR_PSBL_PRD_ORD			
+			, eee.LCTR_PSBL_PRD_ORD
+			*/			
 		FROM (
 				SELECT 
 					to_date(aa.yr_mnt_day_str,'YYYY-MM-DD')					AS datez
@@ -401,7 +410,10 @@
                LEFT OUTER JOIN vea_area_lctr_stng bbb
                ON    (
                              aaa.area_cd  =bbb.area_cd
-                      AND    bbb.rnds_ord  = #rndsOrd#
+                             /*
+                      AND    bbb.rnds_ord  = rndsOrd
+                      */
+                      AND    bbb.rnds_ord  = #yr#
                       )
                LEFT OUTER JOIN lettccmmndetailcode ccc
                ON    (
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp
index 14493f92..d46c300f 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp
@@ -14,6 +14,20 @@
 	/**
 	 * @Class Name : advAreaLctrMngList.jsp
 	 * @Description : 지역별 강의관리 설정> 지역별 강의 설정 관리
+	 
+	 년도 종속
+	 	교육가능시수는 년도에 종속
+	 		단 시수 설정 가능일은 회차의 강의가능기간에 따름
+	 	지역별 신청도 년도에 종속
+		 	강의가능시간은 지역에 종속 따라서 년도 종속
+		 	
+	회차 종속
+	 	접수일시는 회차종속
+	 	강의가능기간도 회차에 종속
+	 		불가능일자는 강의가능기간에 종속 따라서 회차에 종속
+	 		
+	 
+	 
 	 * @Modification Information
 	 * @
 	 * @  수정일      수정자          수정내용
@@ -273,11 +287,20 @@
 				return false;
 			}
 
+			/*
 			var p_rndsOrd 		= $("#rndsOrd").val();	
 			if(p_rndsOrd==''){
 				alert("강의가능 시간 변경 대상 회차를 선택해주세요.");
 				return false;
 			}
+			*/
+
+			var p_stngYr 		= $("#stngYr").val();
+
+			if(p_stngYr==''){
+				alert("강의가능 시간 변경 대상 년도를 선택해주세요.");
+				return false;
+			}
 			
 		    //document.listForm.authorCode.value = vAuthorCode;
 		    document.listForm.action = "<c:url value='/kccadr/oprtn/tngrVisitEdu/popup/areaLctrMngLctrPsblTmPopup.do'/>";
@@ -289,7 +312,8 @@
 		//교육설정 등록여부 체크
 		function fncDupleCheck(thisObj){
 			var p_ttlEduCnfrmPsblChasi	= $(thisObj).closest("td").find("input[name=ttlEduCnfrmPsblChasi]").val();
-			var p_rndsOrd 		= $("#rndsOrd").val();				
+			//var p_rndsOrd 		= $("#rndsOrd").val();				
+			var p_rndsOrd 		= $("#stngYr").val();	//회차기준에서 년도 기준으로 변경함
 			var p_areaCd	 	= $(thisObj).closest("tr").find("input[name=checkList]").val();
 			
 			//alert(p_areaCd);
@@ -752,7 +776,7 @@
 				</c:if>
 				
 
-			<c:if test="${not empty selectBasicInfo.rndsOrd}">
+			<c:if test="${not empty list}">
 
 					<!-- 새로운 board 시작 -->
 					<div class="btn_wrap btn_layout01" style="margin-top:20px;margin-bottom:20px;">
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advLctrPrdCalendarPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advLctrPrdCalendarPopup.jsp
index 08e7f640..05577923 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advLctrPrdCalendarPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advLctrPrdCalendarPopup.jsp
@@ -36,6 +36,7 @@
 <script type="text/javascript" src="<c:url value='/js/fullcalendar/5.9.0/locales-all.js'/>"></script>
 <script type="text/javascript">
 $(document).ready(function(){
+	//alert('${rndsOrd}');
 });
 
 var ex_s_todate;// = info.startStr;
@@ -103,6 +104,7 @@ var calendar;
 								todate : info.start,
 								dpStrtDt : s_todate,
 								dpDdlnDt : info.start,
+								rndsOrd	 :	'${rndsOrd}',
 								//todate : info.startStr,
 								//todate : s_todate,
 								//todate : "",