diff --git a/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java b/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java index 71ab8854..f56202c3 100644 --- a/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java +++ b/src/main/java/kcc/kccadr/cmm/innorix/service/impl/InnorixFileServiceImpl.java @@ -584,7 +584,8 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I vEEduAplctVO.setEduAplctOrd(adrInnorixFileVO.getEduAplctOrd()); vEEduAplctVO.setLctrSbjct(adrInnorixFileVO.getLctrSbjct()); - vEEduAplctVO.setLctrDay(adrInnorixFileVO.getLctrDay()); + //ve_edu_aplct 테이블 데이터로 대체 + /*vEEduAplctVO.setLctrDay(adrInnorixFileVO.getLctrDay()); vEEduAplctVO.setLctrStrtH(adrInnorixFileVO.getLctrStrtH()); vEEduAplctVO.setLctrStrtM(adrInnorixFileVO.getLctrStrtM()); vEEduAplctVO.setLctrEndH(adrInnorixFileVO.getLctrEndH()); @@ -593,7 +594,7 @@ public class InnorixFileServiceImpl extends EgovAbstractServiceImpl implements I vEEduAplctVO.setLctrPlace(adrInnorixFileVO.getLctrPlace()); vEEduAplctVO.setLctrTrgt(adrInnorixFileVO.getLctrTrgt()); vEEduAplctVO.setNos(adrInnorixFileVO.getNos()); - vEEduAplctVO.setInstrNm(adrInnorixFileVO.getInstrNm()); + vEEduAplctVO.setInstrNm(adrInnorixFileVO.getInstrNm());*/ vEEduAplctVO.setAtchFileId(atchFileId); vEEduAplctVO.setFrstRegisterId(adrInnorixFileVO.getUniqId()); diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/areaLctrMng/web/AreaLctrMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/areaLctrMng/web/AreaLctrMngAdultController.java index f576892b..d5272c0c 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/areaLctrMng/web/AreaLctrMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/areaLctrMng/web/AreaLctrMngAdultController.java @@ -32,6 +32,7 @@ import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; import kcc.kccadr.kccadrCom.service.KccadrMgrUdtService; import kcc.let.uat.uia.service.SsoLoginVO; import kcc.let.utl.fcc.service.EgovCryptoUtil; +import kcc.ve.cmm.VeConstants; import kcc.ve.cmm.VeInstrFeeMng; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEAsgnmMIXService; import kcc.ve.instr.tngrVisitEdu.asgnmInfo.service.VEEduChasiInstrAsgnmService; @@ -1212,6 +1213,51 @@ public class AreaLctrMngAdultController { } + /** + * 결과보고 + */ + @RequestMapping("popup/rsltRprtPopup.do") + public String rsltRprtPopup( + @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + //로그인 처리==================================== + //로그인 정보 가져오기 + + //String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request); + //if (!"".equals(s_userCheckNInfo)) return s_userCheckNInfo; + + //로그인 처리==================================== + + try { + //기본데이터 불러오기 + vEEduAplctVO = vEEduAplctService.selectDetail(vEEduAplctVO); + + //데이터 복호화 - VO 단위로 만들어서 사용 + vEEduAplctVO = egovCryptoUtil.decryptVEEduAplctVOInfo(vEEduAplctVO); + + model.addAttribute("info", vEEduAplctVO); + + //교육신청 차시 리스트 - 강의일시 및 강사 정보 조회용 + VEEduChasiVO vEEduChasiVO = new VEEduChasiVO(); + vEEduChasiVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_20); + vEEduChasiVO.setPageIndex(0); + vEEduChasiVO.setSiteId("20"); + List vEEduChasiVOList = vEEduMIXService.selectChasiList202312(vEEduChasiVO); + //복호화 + vEEduChasiVOList = egovCryptoUtil.decryptVEEduChasiVOList(vEEduChasiVOList); + + model.addAttribute("chasiList", vEEduChasiVOList); + + }catch(Exception ex) { + ex.printStackTrace(); + } + + return "oprtn/adultVisitEdu/popup/rsltRprtPopup"; + } ////////////////////////////////////////////////////////////////////////////////////////////////////////////// // // diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp index 6fe39f2a..97af1799 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp @@ -83,6 +83,15 @@ document.createForm.submit(); } + //결과보고 + function fncRsltRprtInfo() { //메뉴생성 화면 호출 + //document.listForm.authorCode.value = vAuthorCode; + document.chasiStatusPopForm.action = ""; + window.open("#", "_rsltRprtPop", "scrollbars = no, top=100px, left=100px, height=700px, width=750px"); + document.chasiStatusPopForm.target = "_rsltRprtPop"; + document.chasiStatusPopForm.submit(); + } + function fncExcelDown(){ var listForm = document.createForm ; listForm.action = ""; @@ -185,7 +194,7 @@ " /> " /> - + " /> @@ -429,18 +438,21 @@ - -

결과보고

- - - - - - - - - - + + +

결과보고

+ + <%-- + + + + + + --%> + + + +

강사료

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/rsltRprtPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/rsltRprtPopup.jsp new file mode 100644 index 00000000..cc17733a --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/popup/rsltRprtPopup.jsp @@ -0,0 +1,174 @@ + +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> +<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %> +<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<% + /** + * @Class Name : instrCostPopup.jsp + * @Description : 강사비용 팝업 + * @Modification Information + * @ + * @ 수정일 수정자 수정내용 + * @ ------- -------- --------------------------- + * @ 2021.08.09 김봉호 최초 생성 + * @author 안주영 + * @since 2022.01.04 + * @version 1.0 + * @see + * + */ +%> + + + + + 결과보고팝업 + + + + + + "> + "> + " /> + +
+
+
+

결과보고

+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+

강의주제

+
+

강의날짜

+ 		+ +
+

강의시간

+ 		+ + + ~ + + + (${list.lrnTm}분) +
+

교육매체

+ 		+ + + + + + +
+

장 소

+ 		+ +
+

교육대상

+ 		+ +
+

인원

+ 		+ +
+

강사명(소속)

+ 		+ + + + - + + + + + + +
+

첨부파일

+ 		+ + + +
+ +
+
+
+
+ +
+
+
+
+
+
+ + + + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp index eabe1fdc..aa316347 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp @@ -561,22 +561,11 @@ function fn_callBackInnorix(data){ var url = ""; - // 강의 일시 - var lctrDay = $('input[name=lctrDay]').val().replaceAll('.', '-'); - var sendData = { "eduAplctOrd": '' - , "lctrDay": lctrDay - , "lctrStrtH": $('#lctrStrtH').val() - , "lctrStrtM": $('#lctrStrtM').val() - , "lctrEndH": $('#lctrEndH').val() - , "lctrEndM": $('#lctrEndM').val() , "innorixFileListVO": data , "lctrSbjct" : $('#lctrSbjct').val() - , "lctrPlace" : $('#lctrPlace').val() - , "lctrTrgt" : $('#lctrTrgt').val() - , "nos" : $('#nos').val() - , "instrNm" : $('#instrNm').val() + , "type" : "RSLT" , "successMsg" : "등록이 완료되었습니다." } @@ -1501,7 +1490,7 @@
-

강의 개요

+

결과보고

@@ -1543,14 +1532,31 @@ - - -

장 소

- - - - - + + + +

교육매체

+ + + + + + + + + + + + + + +

장 소

+ + + + + +

교육대상

@@ -1661,46 +1667,60 @@ - - -

강의날짜

- - - - - - - -

강의시간

- - -
- - - : - + + + +

강의날짜

+ + + + + + + +

강의시간

+ + + + ~ - - - : - - - - - - -

장 소

- - - - - + + + (${list.lrnTm}분) + + + + + + +

교육매체

+ + + + + + + + + + + + + + +

장 소

+ + + + + +

교육대상

- + @@ -1708,7 +1728,7 @@

인 원

- + @@ -1716,7 +1736,16 @@

강사명(소속)

- + + + + - + + + + + +