tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2023-10-24 16:26 청소년 강의 설정 마무리

Browse Source
This commit is contained in:
myname 2023-10-24 15:26:38 +09:00
parent 03fa12b1bd
commit 0f52196e7d
6 changed files with 59 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -239,6 +239,7 @@ public class AdvAreaLctrMngTngrController {
VEAStngVO vEAStngVO = new VEAStngVO();
vEAStngVO.setYr(vELctrDetailVO.getStngYr());
vEAStngVO.setRndsOrd(vELctrDetailVO.getRndsOrd());
//vEAStngVO.setRndsOrd(vELctrDetailVO.getStngYr());
@ -1008,6 +1009,12 @@ public class AdvAreaLctrMngTngrController {
//model.addAttribute("selectBasicList", selectBasicList);
System.out.println(vEAStngVO.getRndsOrd());
System.out.println(vEAStngVO.getRndsOrd());
model.addAttribute("rndsOrd", vEAStngVO.getRndsOrd());
}catch(Exception ex)
{

3
src/main/java/kcc/ve/oprtn/tngrVisitEdu/areaLctrMng/web/AreaLctrMngTngrController.java
View File

@ -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");

4
src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrPsblPrdStng_SQL_Tibero.xml
View File

@ -227,5 +227,9 @@
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>

18
src/main/resources/egovframework/sqlmap/ve/tngr/VEALctrYrStngMix_SQL_Tibero.xml
View File

@ -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
@ -229,8 +236,10 @@
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
/*
, ddd.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 (

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

@ -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;">

2
src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/advLctrPrdCalendarPopup.jsp
View File

@ -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 : "",