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 f6cbe825..bd1c5011 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 @@ -345,12 +345,11 @@ SELECT d.edu_hope_dt, SUM(d.chasi) AS psblTmQnttyCnt , replace(d.edu_hope_dt,'.','-') - FROM vea_lctr_rnds_stng a , + FROM vea_lctr_rnds_stng b , ve_edu_aplct c , ve_edu_chasi d WHERE 1 =1 - AND a.yr =b.yr AND b.RNDS_ORD =c.RNDS_ORD AND c.EDU_APLCT_ORD =d.EDU_APLCT_ORD AND NVL(c.use_yn,'Y')='Y' @@ -417,12 +416,11 @@ ( SELECT d.edu_hope_dt, SUM(d.chasi) AS psblTmQnttyCnt , REPLACE(d.edu_hope_dt,'.','-') - FROM vea_lctr_rnds_stng a , + FROM vea_lctr_rnds_stng b , ve_edu_aplct c , ve_edu_chasi d WHERE 1 =1 - AND a.yr =b.yr AND b.RNDS_ORD =c.RNDS_ORD AND c.EDU_APLCT_ORD =d.EDU_APLCT_ORD AND NVL(c.use_yn,'Y')='Y' @@ -462,9 +460,14 @@ bbb.ttl_edu_cnfrm_psbl_chasi AS ttlEduCnfrmPsblChasi , bbb.ttl_rgstr_chasi AS ttlRgstrChasi , bbb.ttl_rgstr_chasi_regist_pnttm AS ttlRgstrChasiRegistPnttm - , bbb.ttl_rgstr_chasi_register_id AS ttlRgstrChasiRegisterId + , bbb.ttl_rgstr_chasi_register_id AS ttlRgstrChasiRegisterId + + , NVL(eee.psblTmQnttyCnt,0) AS psblTmQnttyCnt + , NVL(eee.dChasi,0) AS aplctChasi - FROM ( SELECT + FROM ( + /* Step1.등록된 지역코드 가져오기 */ + SELECT aa.area_cd FROM ( SELECT area_cd @@ -483,6 +486,8 @@ aa.area_cd ) aaa + + /* Step2.해당 년도별 지역설정값 가져오기 */ LEFT OUTER JOIN vea_area_lctr_stng bbb ON ( aaa.area_cd =bbb.area_cd @@ -491,15 +496,51 @@ */ AND bbb.rnds_ord = #yr# ) + + /* Step3.해당 지역 명칭 가져오기 */ LEFT OUTER JOIN lettccmmndetailcode ccc ON ( ccc.code_id='VE0008' AND aaa.area_cd=ccc.code ) + + /* Step4.해당 설정 등록자 이름 가져오기 */ LEFT OUTER JOIN lettnemplyrinfo ddd ON ( ddd.esntl_id=bbb.frst_register_id ) + + /* Step5.지역별 신청 차시(해당 년도 회차에 속해서 신청한 것만) */ + LEFT OUTER JOIN ( + SELECT + c.edu_slct_cd + , CASE WHEN c.edu_slct_cd='10' THEN '400' ELSE c.edu_slct_area_cd END AS edu_slct_area_cd + , SUM(d.chasi) AS psblTmQnttyCnt + , count(d.chasi) AS dChasi + + FROM + vea_lctr_rnds_stng b , + ve_edu_aplct c , + ve_edu_chasi d + WHERE 1 =1 + AND b.yr=#yr# + + AND b.RNDS_ORD =c.RNDS_ORD + AND c.EDU_APLCT_ORD =d.EDU_APLCT_ORD + AND NVL(c.use_yn,'Y')='Y' + AND c.SBMT_YN = 'Y' + /* 요청(10), 선정완료(120), 승인(20), 교육확정(60), 수정요청(70), 수정요청 완료(80), 대기 수량(230)을 모두 카운트 한다. * 참고용 취소(40) * */ + AND c.aprvl_cd IN ('10', + '120', + '20', + '60', + '70', + '80', + '230') + GROUP BY c.edu_slct_cd + , CASE WHEN c.edu_slct_cd='10' THEN '400' ELSE c.edu_slct_area_cd END + )eee + on(aaa.area_cd=eee.edu_slct_area_cd) WHERE 1=1 ORDER BY ccc.code_nm 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 2efcde21..0e6ed3df 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/advAreaLctrMngList.jsp @@ -844,7 +844,8 @@ onclick="fncDupleCheck(this); return false;" style="height: 40px; border-radius: 5px; vertical-align: middle;">수정 - + + ()