From ef6439db6aaffe047f73ea33cc0e469cedaa2de9 Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 12 Dec 2023 11:33:39 +0900 Subject: [PATCH 1/3] =?UTF-8?q?=EC=8B=A4=EB=AC=B4=EC=97=AD=EB=9F=89?= =?UTF-8?q?=EA=B0=95=ED=99=94=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=9A=B4?= =?UTF-8?q?=EC=98=81=EA=B3=84=ED=9A=8D=EC=84=9C=20=EB=8B=A4=EC=9A=B4?= =?UTF-8?q?=EB=A1=9C=EB=93=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cndtnSspnIdtmt/cndtnEduPrcsMngDetail.jsp | 12 +++++++++--- .../cndtnSspnIdtmt/cndtnEduPrcsMngMdfy.jsp | 17 +++++++++++++++-- .../oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp | 16 ++++++++++++---- .../fndthEnhanceTrn/fndthEduPrcsMngReg.jsp | 14 ++++---------- .../ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp | 12 ++++++++++-- .../ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp | 4 ++-- 6 files changed, 52 insertions(+), 23 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngDetail.jsp index e988fe72..b939d004 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngDetail.jsp @@ -91,9 +91,15 @@
-
- 이미지를 넣어주세요 -
+
+ + 이미지를 넣어주세요 + + + 사진?atchFileId=' /> + + +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngMdfy.jsp index d4f85b5a..596670b8 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngMdfy.jsp @@ -131,6 +131,11 @@ listForm.submit(); } + function fncPhotoPopup() { + var pop = document.createForm; + commonPopWindowopenForm("${pageContext.request.contextPath}/kccadr/oprtn/fndthEnhanceTrn/popup/fndthEduPhotoPopup.do", "750", "660", "fncPhotoPopup", $('#createForm')); + } + @@ -184,9 +189,17 @@
- 이미지를 넣어주세요 + + 이미지를 넣어주세요 + + + 사진?atchFileId=' /> + + +
+
+
-
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp index 1e3750b9..d1c3ffe9 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngReg.jsp @@ -132,6 +132,10 @@ listForm.submit(); } + function fncPhotoPopup() { + var pop = document.createForm; + commonPopWindowopenForm("${pageContext.request.contextPath}/kccadr/oprtn/fndthEnhanceTrn/popup/fndthEduPhotoRegPopup.do", "750", "660", "fncPhotoPopup", $('#createForm')); + } @@ -184,12 +188,16 @@
- 이미지를 넣어주세요 + 이미지를 넣어주세요 + +
+
+
-
-
- + + + <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngReg.jsp index 05cce097..c96aee67 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsMngReg.jsp @@ -189,22 +189,16 @@
-<%-- --%> - 이미지를 넣어주세요 -<%-- --%> -<%-- --%> -<%-- 사진?atchFileId=' /> --%> -<%-- --%> + 이미지를 넣어주세요
-
-
- - + + + <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp index 325fc3d2..733008fa 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail.jsp @@ -274,7 +274,7 @@ - + <%-- 강의계획서 @@ -283,7 +283,15 @@ - + --%> + + + 운영계획서 + + 실무역량강화 운영 계획서.pptx 다운로드 + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp index 768df024..990b673b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp @@ -95,12 +95,12 @@ $(document).ready(function(){ // 현재 날짜가 시작 시간과 종료 시간 사이에 있는지 확인 - if (currentDate >= strtDate && currentDate <= endDate) { + /*i f (currentDate >= strtDate && currentDate <= endDate) { console.log("현재 날짜가 포함됩니다: " + $(this).text().trim()); } else { console.log("현재 날짜가 포함되지 않습니다: " + $(this).text().trim()); $(this).find("button").attr('onclick', 'location.href="${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/eduInfo.do"') - } + } */ }); // 리스트 상태값 확인 From aaff58a3e802e51b9ec83e217e34910c85773857 Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 12 Dec 2023 12:12:03 +0900 Subject: [PATCH 2/3] =?UTF-8?q?=EC=8B=A4=EB=AC=B4=EC=97=AD=EB=9F=89?= =?UTF-8?q?=EA=B0=95=ED=99=94=20=EB=82=98=EC=9D=98=EA=B0=95=EC=9D=98?= =?UTF-8?q?=EC=8B=A4=20-=20=EC=8B=A0=EC=B2=AD=EC=A4=91=EA=B0=95=EC=9D=98/?= =?UTF-8?q?=EC=88=98=EA=B0=95=EC=A4=91=EA=B0=95=EC=9D=98/=EC=A2=85?= =?UTF-8?q?=EB=A3=8C=EB=90=9C=EA=B0=95=EC=9D=98/=20=EB=A7=81=ED=81=AC=20?= =?UTF-8?q?=EC=A1=B0=EA=B1=B4=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml | 9 ++++++--- .../aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp | 8 +++----- .../jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp | 16 +++++++++++++--- 3 files changed, 22 insertions(+), 11 deletions(-) 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 2495d158..b5af3c9f 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,13 +672,16 @@ AND vpap.edu_strt_pnttm #searchEndDt# - + /*VEA003 미이수 : 수강중 강의*/ + AND vadi.aplct_state_cd = '10' + + /*취소 : 취소*/ AND vadi.aplct_state_cd = #searchStatus# - + /*이수완료 : 종료 강의*/ AND vadi.aplct_state_cd = #searchStatus# - + /*요청 : 요청 강의*/ AND a.aprvl_cd = #searchStatus# diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp index a5ef26fe..865453bf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp @@ -309,11 +309,9 @@ $(document).ready(function(){
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp index d9b4b8c0..cac54d94 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/main.jsp @@ -99,11 +99,21 @@ $('#target_confirm_popup-close').click(); } + function fn_goListForm(data){ + var form = document.goListForm ; + form.searchStatus.value = data ; + form.submit(); + + } +
+
" method="post"> + +
@@ -111,13 +121,13 @@

나의강의실

    -
  • '"> +
  • 신청중 강의

    건

    • -
  • '"> +
  • 수강중 강의

    건

    • -
  • '"> +
  • 종료된 강의

    건

From 26c5bcf7986fb1e83744cf75f7b811a876716184 Mon Sep 17 00:00:00 2001 From: hylee Date: Tue, 12 Dec 2023 18:30:05 +0900 Subject: [PATCH 3/3] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EB=A7=88?= =?UTF-8?q?=EC=9D=B4=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=A7=84=ED=96=89?= =?UTF-8?q?=EC=A4=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kcc/let/my/web/MyPageController.java | 176 ++++++++++++++- .../sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml | 18 +- .../cndtnSspnIdtmt/cndtnEduQnaMngList.jsp | 10 +- .../fndthEnhanceTrn/fndthEduQnaMngList.jsp | 10 +- .../WEB-INF/jsp/web/my/myPageDashBoard.jsp | 202 ++++++++++++------ .../WEB-INF/jsp/web/my/myQnaMngList.jsp | 141 ++++++++++++ .../exprnClsrmInfo/exprnClsrmAplctList.jsp | 2 +- .../fndtnEnhanceTrn/fndtnEduAplctList.jsp | 3 +- 8 files changed, 475 insertions(+), 87 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp diff --git a/src/main/java/kcc/let/my/web/MyPageController.java b/src/main/java/kcc/let/my/web/MyPageController.java index 6cebe351..fca0fbed 100644 --- a/src/main/java/kcc/let/my/web/MyPageController.java +++ b/src/main/java/kcc/let/my/web/MyPageController.java @@ -3,6 +3,7 @@ package kcc.let.my.web; import java.io.OutputStream; import java.security.SecureRandom; import java.text.SimpleDateFormat; +import java.time.LocalDate; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; @@ -86,11 +87,15 @@ import kcc.let.sym.mnu.mpm.service.MenuManageVO; import kcc.let.sym.site.service.EgovSiteManagerService; import kcc.let.sym.site.service.SiteManagerVO; import kcc.let.uat.uia.service.SsoLoginVO; +import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.let.utl.sim.service.EgovClntInfo; import kcc.ve.cmm.VeConstants; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduChasiVO; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduMIXService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsAplctPrdService; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsDetailVO; +import kcc.ve.instr.tngrVisitEdu.prcsInfo.service.VEPrcsService; /** * 게시물 관리를 위한 컨트롤러 클래스 @@ -122,6 +127,18 @@ public class MyPageController { @Resource(name = "vEEduMIXService") private VEEduMIXService vEEduMIXService; + //암복호화 유틸 + @Resource(name = "egovCryptoUtil") + EgovCryptoUtil egovCryptoUtil; + + //과정차시 관리 + @Resource(name = "vEPrcsAplctPrdService") + private VEPrcsAplctPrdService vEPrcsAplctPrdService; + + //과정 관리 + @Resource(name = "vEPrcsService") + private VEPrcsService vEPrcsService; + private static final Logger LOGGER = LoggerFactory.getLogger(MyPageController.class); @RequestMapping(value = { "/web/my/myPageDashBoard.do" }) @@ -172,7 +189,7 @@ public class MyPageController { ); model.addAttribute("tngrMap", tngrMap); - model.addAttribute("vtngrList", tngrList); + model.addAttribute("tngrList", tngrList); } /* @@ -200,7 +217,7 @@ public class MyPageController { List adultList = vEEduMIXService.selectChasiListMypage(vEEduChasiVO); - Map tngrMap = adultList.stream() + Map adultMap = adultList.stream() .collect(Collectors.partitioningBy(vo -> "30".equals(vo.getAsgnmAprvlCd()), Collectors.counting())) .entrySet().stream() .collect(Collectors.toMap( @@ -209,11 +226,164 @@ public class MyPageController { ) ); - model.addAttribute("adultMap", tngrMap); + model.addAttribute("adultMap", adultMap); model.addAttribute("adultList", adultList); } + /* + * 체험교실 + * */ + { + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + // 저작권 + vEEduAplctVO.setUserId(loginVO.getUniqId()); + vEEduAplctVO.setRecordCountPerPage(1000000); + vEEduAplctVO.setFirstIndex(0); + vEEduAplctVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_30); + + List vEEduAplctVOList = vEEduMIXService.selectExprnPagingList(vEEduAplctVO); + vEEduAplctVOList = egovCryptoUtil.decryptVEEduAplctVOList(vEEduAplctVOList); + + System.out.println("vEEduAplctVOList.size() :: "+vEEduAplctVOList.size()); +// vEEduAplctVOList에서 10, 11, 12, 13 값 제거 + List filteredList = vEEduAplctVOList.stream() + .filter(item -> !item.getAprvlCd().equals("10") + && !item.getAprvlCd().equals("11") + && !item.getAprvlCd().equals("12") + && !item.getAprvlCd().equals("13")) + .collect(Collectors.toList()); +// -- 종료 80 +// -- 진행중 20~70 + + Map exprnMap = filteredList.stream() + .collect(Collectors.partitioningBy(vo -> "80".equals(vo.getAprvlCd()), Collectors.counting())) + .entrySet().stream() + .collect(Collectors.toMap( + entry -> entry.getKey() ? "exprnEnd" : "exprnIng", + entry -> entry.getValue().toString() + ) + ); + + model.addAttribute("exprnMap", exprnMap); + model.addAttribute("exprnList", filteredList); + } + + /* + * 실무역량강화 + * */ + { + + VEPrcsDetailVO vEPrcsDetailVO = new VEPrcsDetailVO(); + + vEPrcsDetailVO.setUserId(loginVO.getUniqId()); + //기반강화 조회 + vEPrcsDetailVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_50); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부 + vEPrcsDetailVO.setRecordCountPerPage(1000000); + vEPrcsDetailVO.setFirstIndex(0); + + List vEPrcsDetailVOList = vEPrcsAplctPrdService.findByAprvlList(vEPrcsDetailVO); + // 요청 + long cont = vEPrcsDetailVOList.stream().filter(t-> "10".equals(t.getAprvlCd())).count(); + // 미이수 + long aplctStateCd10 = vEPrcsDetailVOList.stream().filter(t-> "10".equals(t.getAplctStateCd())).count(); + // 이수완료 + long aplctStateCd20 = vEPrcsDetailVOList.stream().filter(t-> "20".equals(t.getAplctStateCd())).count(); + + Map fndtnMap = new HashMap<>(); + fndtnMap.put("fndtnEnd", String.valueOf(aplctStateCd20)); + fndtnMap.put("fndtnIng", String.valueOf(aplctStateCd10+cont)); + + model.addAttribute("fndtnMap", fndtnMap); + model.addAttribute("fndtnList", vEPrcsDetailVOList); + + } + // return "/web/cop/bbs/FaqListAjax"; return "web/my/myPageDashBoard"; } + @RequestMapping(value = { "/web/my/myQnaMngList.do" }) + public String myQnaMngList( + HttpServletRequest request + , @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , ModelMap model + ) throws Exception { + + //1.pageing step1 + PaginationInfo paginationInfo = this.setPagingStep1(vEPrcsDetailVO); + //2. pageing step2 + vEPrcsDetailVO = this.setPagingStep2(vEPrcsDetailVO, paginationInfo); + + List vEPrcsDetailVOList = vEPrcsService.selectQnaPagingList(vEPrcsDetailVO); + + //3.pageing step3 + paginationInfo = this.setPagingStep3(vEPrcsDetailVOList, paginationInfo); + + + model.addAttribute("paginationInfo", paginationInfo); + + // 사용자 이름 디코딩 + vEPrcsDetailVOList.stream().forEach(t->t.setMberNm(egovCryptoUtil.decrypt(t.getMberNm()))); + + + //대상 리스트, 페이징 정보 전달 + model.addAttribute("list", vEPrcsDetailVOList); + + return "web/my/myQnaMngList"; + } + + + ////////////////////////////////////////////////////////////////////////////////////////////////////////////// + // + // + // private function + // + // + + //페이징을 위한 처리 step1 - 페이징 기본 정보 설정 + private PaginationInfo setPagingStep1( + VEPrcsDetailVO p_vEPrcsDetailVO + )throws Exception{ + // pageing step1 + PaginationInfo paginationInfo = new PaginationInfo(); + paginationInfo.setCurrentPageNo(p_vEPrcsDetailVO.getPageIndex()); + paginationInfo.setRecordCountPerPage(p_vEPrcsDetailVO.getPageUnit()); + paginationInfo.setPageSize(p_vEPrcsDetailVO.getPageSize()); + + return paginationInfo; + } + + + //페이징을 위한 처리 step2 - 게시물 리스트 수량 설정 및 검색 조건 초기화 + private VEPrcsDetailVO setPagingStep2( + VEPrcsDetailVO p_vEPrcsDetailVO + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step2 + p_vEPrcsDetailVO.setFirstIndex(p_paginationInfo.getFirstRecordIndex()); + p_vEPrcsDetailVO.setLastIndex(p_paginationInfo.getLastRecordIndex()); + p_vEPrcsDetailVO.setRecordCountPerPage(p_paginationInfo.getRecordCountPerPage()); + + if("".equals(p_vEPrcsDetailVO.getSearchSortCnd())){ //최초조회시 최신것 조회List + p_vEPrcsDetailVO.setSearchSortCnd("prcs_ord"); + p_vEPrcsDetailVO.setSearchSortOrd("desc"); + } + + return p_vEPrcsDetailVO; + } + + + //페이징을 위한 처리 step3 - 전체 게시물 수량 설정하기 + private PaginationInfo setPagingStep3( + List p_vEPrcsDetailVOList + + , PaginationInfo p_paginationInfo + )throws Exception{ + // pageing step3 + int totCnt = 0; + if(p_vEPrcsDetailVOList.size() > 0) totCnt = p_vEPrcsDetailVOList.get(0).getTotCnt(); + p_paginationInfo.setTotalRecordCount(totCnt); + + return p_paginationInfo; + } + } diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml index 361bcca9..4d1fa45f 100644 --- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcs_SQL_Tibero.xml @@ -365,14 +365,15 @@ /* VEPrcsDAO.selectQnaPagingList */ SELECT - qn.PRCS_APLCT_PRD_QNA_ORD as prcsAplctPrdQnaOrd + COUNT(1) OVER() AS totCnt + , qn.PRCS_APLCT_PRD_QNA_ORD as prcsAplctPrdQnaOrd , qn.LCTR_DIV_CD as lctrDivCd , qn.QNA_REGIST as qnaRegist , mb.MBER_NM AS mberNm , qn.QNA_CN as qnaCn , qn.QNA_ANSWER_CN as qnaAnswerCn , qn.QNA_ANSWERER as qnaAnswerer - ,TO_CHAR(qn.FRST_REGIST_PNTTM,'YYYY-MM-DD') AS frstRegistPnttm + ,TO_CHAR(qn.FRST_REGIST_PNTTM,'YYYY-MM-DD HH24:MI') AS frstRegistPnttm , qn.FRST_REGISTER_ID as frstRegisterId ,TO_CHAR(qn.LAST_UPDT_PNTTM,'YYYY-MM-DD') AS lastUpdtPnttm , qn.LAST_UPDUSR_ID as lastUpdusrId @@ -382,7 +383,18 @@ ON qn.QNA_REGIST = mb.MBER_ID WHERE 1=1 - AND LCTR_DIV_CD = #lctrDivCd# + + AND qn.LCTR_DIV_CD = #lctrDivCd# + + + AND qn.QNA_CN LIKE '%' || #searchKeyword# || '%' + + + AND TO_CHAR(qn.FRST_REGIST_PNTTM, 'YYYYMMDD') = ]]> REPLACE(#searchSmbtStartDt#, '.' , '') + + + AND TO_CHAR(qn.FRST_REGIST_PNTTM, 'YYYYMMDD') REPLACE(#searchSmbtEndDt#, '.' , '') + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduQnaMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduQnaMngList.jsp index 222a670f..4daa3c54 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduQnaMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduQnaMngList.jsp @@ -136,10 +136,10 @@
- +<%-- +<%-- selectedValue="${vEPrcsDetailVO.searchStatus }" defaultValue="" --%> +<%-- defaultText="전체" --%> +<%-- /> --%>
@@ -147,7 +147,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngList.jsp index 4ed7c19b..82514d5b 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduQnaMngList.jsp @@ -136,10 +136,10 @@
- +<%-- +<%-- selectedValue="${vEPrcsDetailVO.searchStatus }" defaultValue="" --%> +<%-- defaultText="전체" --%> +<%-- /> --%>
@@ -147,7 +147,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp index d14b2985..4ffc8a05 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp @@ -18,6 +18,7 @@ <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> @@ -37,6 +58,9 @@
+
+ +

마이페이지

@@ -44,6 +68,11 @@
+ +
+ +
+
    @@ -84,10 +113,10 @@
-

교육진행 10건

+

교육진행 ${exprnMap['exprnIng']}건

 -

교육종료 05건

+

교육종료 ${exprnMap['exprnEnd']}건
@@ -98,11 +127,11 @@

실무역량강화 마이페이지 아이콘 실무역량강화

- -

교육진행 05건

+ +

교육진행 ${fndtnMap['fndtnIng']}건

 -

교육종료 18건

+

교육종료 ${fndtnMap['fndtnEnd']}건
@@ -136,7 +165,7 @@ - + ', '');"> ${list.eduHopeDt} @@ -199,7 +228,7 @@
찾아가는 교육 성인
- +
@@ -218,25 +247,60 @@ - - - - - - - - - - - - - - - - - - - + + ')"> + + + + + + +
설문
2023-07-26오프라인교육예정미완료
2023-07-26온라인교육완료완료
2023-07-21오프라인교육취소-
${list.eduHopeDt} + + + 대기 + + + 교육신청 + + + 교육승인 + + + 교육반려 + + + 교육취소 + + + 선정완료 + + + 수정요청 + + + 수정완료 + + + 교육확정 + + + 대기 + + + - + + + + + + 제출 + + + 미제출 + + +
@@ -248,7 +312,7 @@
체험교실
- +
@@ -263,29 +327,24 @@ + - - - - - - - - - - - - - - - - - - - + + + + + + + +
운영연도 교육내용학교상태 처리상태결과보고서
2023년담당교과운영확정미제출
2022년체육운영종료제출완료
2023년교과수업운영종료제출완료
+ + + + + ${list.chrgMjr}${list.scholInsttNm}
@@ -295,7 +354,7 @@
실무역량강화 교육
- +
@@ -308,31 +367,36 @@ - - - - + + + + - - - - - - - - - - - - - - - - - - + + + + + + + +
교육일신청상태설문이수증과정명교육시작일교육종료일신청결과
2023-07-26오프라인교육예정-
2023-07-26온라인교육완료출력
2023-07-21오프라인교육취소-
+ + + + + + + + + + + + + + +
diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp new file mode 100644 index 00000000..76e8ccc3 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/my/myQnaMngList.jsp @@ -0,0 +1,141 @@ +<%@ page contentType="text/html; charset=utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="un" uri="http://jakarta.apache.org/taglibs/unstandard-1.0" %> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + +교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템 + + + + +
+ +
+ +
+
+ +
+
+
+ + + + " /> + " /> + +
+

내 교육문의

+
+ + +
+
+ <%--
+
+ + +
+
+
+ + +
+ ~ +
+ + +
+ + + +
+
--%> + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
내 문의 목록
강의구분문의내용문의일시답변여부
+ + + + + + + + + - + + + 완료 + + + +
+
+ +
+
+
+
+
+
+ +
+
+ + +
+ +
+ +
+ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp index 70384562..0b6e070a 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctList.jsp @@ -178,7 +178,7 @@ - + ${list.aprvlCd} diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp index 865453bf..d5ed5043 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/fndtnEduAplctList.jsp @@ -355,7 +355,8 @@ $(document).ready(function(){ ');" style="cursor:pointer;"> - () +<%-- () --%> + ~