From 16293fc9a49e9e5969970b01b768a4127553b1e0 Mon Sep 17 00:00:00 2001 From: myname Date: Wed, 14 Feb 2024 17:49:19 +0900 Subject: [PATCH] =?UTF-8?q?2024-02-14=2017:49=20=EC=B2=B4=ED=97=98?= =?UTF-8?q?=EA=B5=90=EC=8B=A4=20=EC=9A=B4=EC=98=81=EA=B3=84=ED=9A=8D?= =?UTF-8?q?=EC=84=9C=20=EC=B6=9C=EB=A0=A5=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../aplct/comweb/CrownixAjaxController.java | 354 ++++++++---- .../impl/ExprnClsrmAplctServiceImpl.java | 23 +- .../cpyrgExprnClsrm/oprtnStateMngDetail.jsp | 73 ++- .../exprnClsrmAplctDashboard.jsp | 41 ++ .../exprnClsrmInfo/exprnDocumentDashboard.jsp | 539 +++++++++--------- 5 files changed, 636 insertions(+), 394 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java index c15a7981..dac78dd1 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java @@ -26,6 +26,7 @@ import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcMixService; import kcc.ve.adv.tngr.stngInfo.service.VEACmpltCrtfcVO; import kcc.ve.aplct.fndtnEnhanceTrn.service.FndtnEnhanceTrnService; 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.instrInfo.service.VEInstrDetailService; import kcc.ve.instr.tngrVisitEdu.instrInfo.service.VEInstrDetailVO; @@ -853,129 +854,65 @@ public class CrownixAjaxController { } - - - /////////////////////////////////////////////////////////////////// - // - // - // private function - // - // - - //리포트 메인 페이지 정보 - private ModelAndView _makeInstrActivityMainReportPage( - ModelAndView p_modelAndView - , VEInstrDetailVO p_vEInstrDetailVODetail - ) throws Exception{ + /** + * 체험교실 차시별 운영계획 + * + */ + @RequestMapping("/ve/aplct/cpyrgExprnClsrm/exprnPlanAjax.do") + public ModelAndView cpyrgExprnClsrmExprnPlanAjax( + ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + System.out.println("----------------"); + //System.out.println(request.getParameter("p_userId")); + System.out.println(request.getParameter("p_eduAplctOrd")); + + System.out.println("----------------"); + + //String s_user_id = request.getParameter("p_userId"); + String s_eduAplctOrd = request.getParameter("p_eduAplctOrd"); + + + //운영계획 차시 리스트 + VEEduChasiVO vEEduChasiVO = new VEEduChasiVO(); + vEEduChasiVO.setEduAplctOrd(s_eduAplctOrd); + vEEduChasiVO.setInstrDiv("30"); + vEEduChasiVO.setPageIndex(0); + List vEEduChasiVOList = vEEduMIXService.selectChasiList(vEEduChasiVO); + + + + /* + //강사신청정보 + VEInstrDetailVO vEInstrDetailVO = new VEInstrDetailVO(); + vEInstrDetailVO.setInstrDiv("20"); + vEInstrDetailVO.setUseYn("Y"); + vEInstrDetailVO.setSbmtYn("Y"); + + vEInstrDetailVO.setUserId(s_user_id); + vEInstrDetailVO.setInstrDetailActvtHstryOrd(s_instrDetailActvtHstryOrd); + + VEInstrDetailVO vEInstrDetailVODetail = vEInstrDetailService.selectDetail4actvtHstry(vEInstrDetailVO); + vEInstrDetailVODetail = egovCryptoUtil.decryptVEInstrDetailVO(vEInstrDetailVODetail); + */ + + //문서번호 - if ("".equals(p_vEInstrDetailVODetail.getDocuNmbr()) - || p_vEInstrDetailVODetail.getDocuNmbr()==null - ) { - p_modelAndView.addObject("page_1_10", "<->"); //문서번호 - }else { - p_modelAndView.addObject("page_1_10", "<"+p_vEInstrDetailVODetail.getDocuNmbrDp()+">"); //문서번호 - } + //modelAndView = this._makeInstrActivityMainReportPage(modelAndView, vEInstrDetailVODetail); + //modelAndView.addObject("page_1_31", "상기 인은 우리 위원회에서 저작권 강사(성인강사)로 위촉되어 활동하였음을 확인합니다."); //확인멘트 + //강사활동리스트 + //modelAndView = this._makeInstrActivitySubReportPage(modelAndView, vEInstrDetailVO, s_instrDetailActvtHstryOrd); + + //차시별 운영계획 + modelAndView = this._makeExprnPlanSubReportPage(modelAndView, vEEduChasiVOList); - p_modelAndView.addObject("page_1_11", p_vEInstrDetailVODetail.getInstrNm()); //성명 + return modelAndView; - if (p_vEInstrDetailVODetail.getdBirth().length()==8) { - p_modelAndView.addObject("page_1_12", p_vEInstrDetailVODetail.getdBirth().substring(0,4)+"년 "+p_vEInstrDetailVODetail.getdBirth().substring(4,6)+"월 "+p_vEInstrDetailVODetail.getdBirth().substring(6,8)+"일"); //생년월일 - }else { - p_modelAndView.addObject("page_1_12", p_vEInstrDetailVODetail.getdBirth()); //생년월일 - } - - p_modelAndView.addObject("page_1_13", p_vEInstrDetailVODetail.getSex()); //성별 - p_modelAndView.addObject("page_1_14", p_vEInstrDetailVODetail.getBsnsNm()); //사업자명 - p_modelAndView.addObject("page_1_15", p_vEInstrDetailVODetail.getBsnsNmbr()); //사업자등록번호 - p_modelAndView.addObject("page_1_16", p_vEInstrDetailVODetail.getPhone()); //전화번호 - p_modelAndView.addObject("page_1_17", p_vEInstrDetailVODetail.getAddr()+p_vEInstrDetailVODetail.getAddrDetail()); //주소 - - p_modelAndView.addObject("page_1_21", p_vEInstrDetailVODetail.getPurpose()); //용도 - - //발행기관 정보 - p_modelAndView.addObject("page_1_22", "비영리"); //업종 - p_modelAndView.addObject("page_1_23", "120-82-09301"); //사업자등록번호 - p_modelAndView.addObject("page_1_24", "최병구"); //대표자 - p_modelAndView.addObject("page_1_25", "교육체험본부(교육운영팀)"); //담당부서 - p_modelAndView.addObject("page_1_26", "경상남도 진주시 소호로 117"); //주소 - - if ("Y".equals(p_vEInstrDetailVODetail.getQlfctEndYn())) { - p_modelAndView.addObject("page_1_27", p_vEInstrDetailVODetail.getAprvlPnttm()+"~"+p_vEInstrDetailVODetail.getQlfctEndPnttm()); //위촉기간 - }else { - p_modelAndView.addObject("page_1_27", p_vEInstrDetailVODetail.getAprvlPnttm()+"~"); //위촉기간 - } - - - //modelAndView.addObject("page_1_28", "-"); //활동내용 - - //p_modelAndView.addObject("page_1_31", "상기 인은 우리 위원회에서 저작권 강사(청년강사)로 위촉되어 활동하였음을 확인합니다."); //확인멘트 - p_modelAndView.addObject("page_1_31", "상기 인은 우리 위원회에서 청소년 전담강사로 위촉되어 활동하였음을 확인합니다."); //확인멘트 - p_modelAndView.addObject("page_1_32", p_vEInstrDetailVODetail.getHstryPnttm()); //발행일(승인일) - - - return p_modelAndView; - } - - //강사활동리스트 리포트 서브 페이지 정보 - private ModelAndView _makeInstrActivitySubReportPage( - ModelAndView p_modelAndView - , VEInstrDetailVO p_vEInstrDetailVO - , String p_instrDetailActvtHstryOrd - ) throws Exception{ - - p_vEInstrDetailVO.setInstrDetailActvtHstryOrd(p_instrDetailActvtHstryOrd); - List vEInstrDetailVOList = vEInstrMixService.selectPagingActivityList4Report(p_vEInstrDetailVO); - - //복호화 - vEInstrDetailVOList = egovCryptoUtil.decryptVEInstrDetailVOList(vEInstrDetailVOList); - - JSONArray jsReqInfo = new JSONArray(); //차시 정보 - - int i_sumChasi = 0; - for (int i=0;i"); //문서번호 + }else { + p_modelAndView.addObject("page_1_10", "<"+p_vEInstrDetailVODetail.getDocuNmbrDp()+">"); //문서번호 + } + + + p_modelAndView.addObject("page_1_11", p_vEInstrDetailVODetail.getInstrNm()); //성명 + + if (p_vEInstrDetailVODetail.getdBirth().length()==8) { + p_modelAndView.addObject("page_1_12", p_vEInstrDetailVODetail.getdBirth().substring(0,4)+"년 "+p_vEInstrDetailVODetail.getdBirth().substring(4,6)+"월 "+p_vEInstrDetailVODetail.getdBirth().substring(6,8)+"일"); //생년월일 + }else { + p_modelAndView.addObject("page_1_12", p_vEInstrDetailVODetail.getdBirth()); //생년월일 + } + + p_modelAndView.addObject("page_1_13", p_vEInstrDetailVODetail.getSex()); //성별 + p_modelAndView.addObject("page_1_14", p_vEInstrDetailVODetail.getBsnsNm()); //사업자명 + p_modelAndView.addObject("page_1_15", p_vEInstrDetailVODetail.getBsnsNmbr()); //사업자등록번호 + p_modelAndView.addObject("page_1_16", p_vEInstrDetailVODetail.getPhone()); //전화번호 + p_modelAndView.addObject("page_1_17", p_vEInstrDetailVODetail.getAddr()+p_vEInstrDetailVODetail.getAddrDetail()); //주소 + + p_modelAndView.addObject("page_1_21", p_vEInstrDetailVODetail.getPurpose()); //용도 + + //발행기관 정보 + p_modelAndView.addObject("page_1_22", "비영리"); //업종 + p_modelAndView.addObject("page_1_23", "120-82-09301"); //사업자등록번호 + p_modelAndView.addObject("page_1_24", "최병구"); //대표자 + p_modelAndView.addObject("page_1_25", "교육체험본부(교육운영팀)"); //담당부서 + p_modelAndView.addObject("page_1_26", "경상남도 진주시 소호로 117"); //주소 + + if ("Y".equals(p_vEInstrDetailVODetail.getQlfctEndYn())) { + p_modelAndView.addObject("page_1_27", p_vEInstrDetailVODetail.getAprvlPnttm()+"~"+p_vEInstrDetailVODetail.getQlfctEndPnttm()); //위촉기간 + }else { + p_modelAndView.addObject("page_1_27", p_vEInstrDetailVODetail.getAprvlPnttm()+"~"); //위촉기간 + } + + + //modelAndView.addObject("page_1_28", "-"); //활동내용 + + //p_modelAndView.addObject("page_1_31", "상기 인은 우리 위원회에서 저작권 강사(청년강사)로 위촉되어 활동하였음을 확인합니다."); //확인멘트 + p_modelAndView.addObject("page_1_31", "상기 인은 우리 위원회에서 청소년 전담강사로 위촉되어 활동하였음을 확인합니다."); //확인멘트 + p_modelAndView.addObject("page_1_32", p_vEInstrDetailVODetail.getHstryPnttm()); //발행일(승인일) + + + return p_modelAndView; + } + + //강사활동리스트 리포트 서브 페이지 정보 + private ModelAndView _makeInstrActivitySubReportPage( + ModelAndView p_modelAndView + , VEInstrDetailVO p_vEInstrDetailVO + , String p_instrDetailActvtHstryOrd + ) throws Exception{ + + p_vEInstrDetailVO.setInstrDetailActvtHstryOrd(p_instrDetailActvtHstryOrd); + List vEInstrDetailVOList = vEInstrMixService.selectPagingActivityList4Report(p_vEInstrDetailVO); + + //복호화 + vEInstrDetailVOList = egovCryptoUtil.decryptVEInstrDetailVOList(vEInstrDetailVOList); + + JSONArray jsReqInfo = new JSONArray(); //차시 정보 + + int i_sumChasi = 0; + for (int i=0;i p_vEEduChasiVOList + ) throws Exception{ + + //p_vEInstrDetailVO.setInstrDetailActvtHstryOrd(p_instrDetailActvtHstryOrd); + //List vEInstrDetailVOList = vEInstrMixService.selectPagingActivityList4Report(p_vEInstrDetailVO); + + //복호화 + //vEInstrDetailVOList = egovCryptoUtil.decryptVEInstrDetailVOList(vEInstrDetailVOList); + + JSONArray jsReqInfo = new JSONArray(); //차시 정보 + + int i_sumChasi = 0; + for (int i=0;i + + ${status.count} + @@ -446,14 +449,14 @@ - - - - ~ - - - (${list.lrnTm}분) - + +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> +<%-- (${list.lrnTm}분) --%> + ${list.lrnSbjct} ${list.lrnCn} ${list.rmrks} @@ -466,6 +469,17 @@ + +
+
+ +
+
+
+
+ +
+

결과보고

@@ -710,5 +724,48 @@
+ + + + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp index f1c5e3a0..f9953d8f 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp @@ -100,3 +100,44 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp index 8b26c1c9..01177cbc 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp @@ -341,7 +341,7 @@ alert('교육희망일은 오늘 이후의 날짜로 입력해주세요.'); return flag = false; } - + /* if($(this).find('input[name=strtTm]').val() == ''){ alert('교육시작 시간을 입력해주세요.'); $('input[name=strtTm]:eq('+idx+')').focus(); @@ -366,6 +366,7 @@ $('input[name=endTm]:eq('+idx+')').focus(); return flag = false; } + */ if($(this).find('input[name=lrnSbjct]').val() == ''){ alert('학습주제를 입력해주세요.'); @@ -595,139 +596,142 @@ + + 자동생성 +
- -
-
- - - - " class="time" name="strtTm" title="시작 시간 입력" readonly> - -
-
-

시간 선택

-
-
-
- -
- : -
- -
-
- -
-
-
- - - - " class="time" name="endTm" title="종료 시간 입력" readonly> - -
-
-

시간 선택

-
-
-
- -
- : -
- -
-
- -
-
(분) -
- + + + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- " class="time" name="strtTm" title="시작 시간 입력" readonly> --%> +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- --%> +<%-- --%> +<%-- --%> +<%-- " class="time" name="endTm" title="종료 시간 입력" readonly> --%> +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- (분) --%> + + @@ -762,8 +766,8 @@ -

필수입력 항목*

교육희망일 -

필수입력 항목*

시간 +

필수입력 항목*

차시 +

필수입력 항목*

일자

필수입력 항목*

학습주제

필수입력 항목*

지도내용 비고 @@ -772,134 +776,137 @@ + + 자동생성 +
- -
-
- - -
-
-

시간 선택

-
-
-
- -
- : -
- -
-
- -
-
-
- - -
-
-

시간 선택

-
-
-
- -
- : -
- -
-
- -
-
(분) -
- + + + + +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- --%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1006,6 +1013,9 @@ + ${status.count} + + ${list.eduHopeDt} @@ -1013,15 +1023,14 @@ - - - - - - - ~ - - - (${list.lrnTm}분) + + +<%-- --%> +<%-- --%> + +<%-- --%> +<%-- --%> +<%-- (${list.lrnTm}분) --%> ${list.lrnSbjct} ${list.lrnCn} @@ -1054,9 +1063,11 @@ - + + + + -