diff --git a/src/main/resources/egovframework/sqlmap/ve/instr/VESttst_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/instr/VESttst_MIX_SQL_Tibero.xml index 15cadc1f..6e3e1b13 100644 --- a/src/main/resources/egovframework/sqlmap/ve/instr/VESttst_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/instr/VESttst_MIX_SQL_Tibero.xml @@ -2311,6 +2311,7 @@ vea_sspn_idmt_trgt a , ve_edu_aplct b , ve_prcs_aplct_prd c + , vea_aplct_detail_info d WHERE SUBSTRING(c.edu_strt_pnttm,1,4)=#mngNmbrYr# AND b.aprvl_cd='60' @@ -2324,6 +2325,9 @@ AND a.edu_state_cd = #searchEduStateCd# + AND b.EDU_APLCT_ORD =d.EDU_APLCT_ORD + AND d.aplct_state_cd = '20' + GROUP BY SUBSTRING(c.edu_strt_pnttm,6,2) , b.prcs_ord @@ -2391,13 +2395,14 @@ SUBSTRING(c.edu_strt_pnttm,6,2) AS CMPTNT_ATHRT , count(*) AS cnt , b.prcs_ord - , sum(CASE WHEN a.edu_state_cd='20' THEN 1 ELSE 0 END) AS edu_cd_20 - , sum(CASE WHEN a.edu_state_cd='40' THEN 1 ELSE 0 END) AS edu_cd_40 - , sum(CASE WHEN a.edu_state_cd='50' THEN 1 ELSE 0 END) AS edu_cd_50 + , sum(CASE WHEN a.edu_state_cd='20' AND d.aplct_state_cd = '20' THEN 1 ELSE 0 END) AS edu_cd_20 + , sum(CASE WHEN d.aplct_state_cd='10' THEN 1 ELSE 0 END) AS edu_cd_40 + , sum(CASE WHEN d.aplct_state_cd='60' THEN 1 ELSE 0 END) AS edu_cd_50 FROM vea_sspn_idmt_trgt a , ve_edu_aplct b , ve_prcs_aplct_prd c + , vea_aplct_detail_info d WHERE SUBSTRING(c.edu_strt_pnttm,1,4)=#mngNmbrYr# AND b.aprvl_cd='60' @@ -2407,7 +2412,9 @@ /* 병합제거시 주석 제거 할것 AND a.prcs_aplct_prd_ord_cmplt IS null */ - AND a.edu_state_cd IN ('20','40','50') /* 20-이수 40-미이수 50-연기 */ + AND a.edu_state_cd IN ('20','40','50') /* 20-이수 40-미이수 50-연기 */ + + AND b.EDU_APLCT_ORD =d.EDU_APLCT_ORD GROUP BY SUBSTRING(c.edu_strt_pnttm,6,2) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp index 7abb449e..4dea1391 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -787,15 +787,15 @@ - -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> +<%-- --%> + + + + + + + +