diff --git a/src/main/java/kcc/let/my/web/MyPageController.java b/src/main/java/kcc/let/my/web/MyPageController.java index dfb82706..6cebe351 100644 --- a/src/main/java/kcc/let/my/web/MyPageController.java +++ b/src/main/java/kcc/let/my/web/MyPageController.java @@ -197,10 +197,10 @@ public class MyPageController { vEEduChasiVO.setPageUnit(vEEduAplctVO.getPageUnit()); vEEduChasiVO.setPageSize(vEEduAplctVO.getPageSize()); - List vEEduChasiVOList = vEEduMIXService.selectChasiListMypage(vEEduChasiVO); + List adultList = vEEduMIXService.selectChasiListMypage(vEEduChasiVO); - Map tngrMap = vEEduChasiVOList.stream() + Map tngrMap = adultList.stream() .collect(Collectors.partitioningBy(vo -> "30".equals(vo.getAsgnmAprvlCd()), Collectors.counting())) .entrySet().stream() .collect(Collectors.toMap( @@ -210,6 +210,7 @@ public class MyPageController { ); model.addAttribute("adultMap", tngrMap); + model.addAttribute("adultList", adultList); } // return "/web/cop/bbs/FaqListAjax"; return "web/my/myPageDashBoard"; diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml index 81f9d216..2495d158 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml @@ -672,6 +672,15 @@ AND vpap.edu_strt_pnttm #searchEndDt# + + AND vadi.aplct_state_cd = #searchStatus# + + + AND vadi.aplct_state_cd = #searchStatus# + + + AND a.aprvl_cd = #searchStatus# + /*AND a.aprvl_cd != '100' 찜하기 제거*/ ORDER BY vpap.edu_strt_pnttm desc diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp index 72c2fc39..64458d42 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/sspnIdtmtEduAplctList.jsp @@ -11,10 +11,10 @@ 교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템 -<%-- --%> -<%-- --%> -<%-- --%> -<%-- --%> + + + +