From c0fd9d8e1cb96253909df3cd37178131075cc2c2 Mon Sep 17 00:00:00 2001 From: myname Date: Wed, 15 Nov 2023 16:12:18 +0900 Subject: [PATCH] =?UTF-8?q?2023-11-15=2016:12=20=EC=84=B1=EC=9D=B8=20?= =?UTF-8?q?=EC=B0=BE=EA=B5=90=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../web/EduAplctMngAdultController.java | 4 +-- .../web/EduAsgnmCnfrmMngAdultController.java | 14 ++++++++++ .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml | 9 +++++++ .../adultVisitEdu/eduAplctCnfrmMngDetail.jsp | 14 ++++++++++ .../adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp | 27 +++++++++++++++---- .../instrInfo/instrPrflDetail.jsp | 2 +- 6 files changed, 62 insertions(+), 8 deletions(-) diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/web/EduAplctMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/web/EduAplctMngAdultController.java index 3f39aae2..80918e49 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/web/EduAplctMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAplctMng/web/EduAplctMngAdultController.java @@ -233,8 +233,8 @@ public class EduAplctMngAdultController { vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_20); List vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO); - vEEduChasiVOList = egovCryptoUtil.decryptVEEduChasiVOList(vEEduChasiVOList); - + //복호화 + vEEduChasiVOList = egovCryptoUtil.decryptVEEduChasiVOList(vEEduChasiVOList); model.addAttribute("chasiList", vEEduChasiVOList); diff --git a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java index 2ef49747..52e9a13b 100644 --- a/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java +++ b/src/main/java/kcc/ve/oprtn/adultVisitEdu/eduAsgnmCnfrmMng/web/EduAsgnmCnfrmMngAdultController.java @@ -245,6 +245,7 @@ public class EduAsgnmCnfrmMngAdultController { //사용자 교육신청 차시 리스트 + /* VEEduChasiVO vEEduChasiVO = new VEEduChasiVO(); vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_20); //성인 vEEduChasiVO.setAprvlCd("60"); //교육확정 코드 @@ -252,6 +253,19 @@ public class EduAsgnmCnfrmMngAdultController { vEEduChasiVO.setPageIndex(0); List vEEduChasiVOList = vEEduMIXService.selectAdultChasiList(vEEduChasiVO); model.addAttribute("chasiList", vEEduChasiVOList); + */ + + //사용자 교육신청 차시 리스트 + VEEduChasiVO vEEduChasiVO = new VEEduChasiVO(); + vEEduChasiVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); + vEEduChasiVO.setInstrDiv(VeConstants.LCTR_DIV_CD_20); + List vEEduChasiVOList = vVEEduChasiService.selectList(vEEduChasiVO); + + //복호화 + vEEduChasiVOList = egovCryptoUtil.decryptVEEduChasiVOList(vEEduChasiVOList); + + model.addAttribute("chasiList", vEEduChasiVOList); + model.addAttribute("cryptoUtil",egovCryptoUtil); diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml index 6bc56de4..580f1cde 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml @@ -3800,16 +3800,25 @@ , A.INSTT_DIV_CD AS insttDivCd , A.EDU_SLCT_CD AS eduSlctCd , B.EDU_CHASI_ORD AS eduChasiOrd + /* , DATE_FORMAT(B.EDU_HOPE_DT,'%Y.%m.%d') AS eduHopeDt + */ + , TO_CHAR(B.EDU_HOPE_DT,'YYYY.MM.DD') AS eduHopeDt , B.STRT_TM AS strtTm , B.END_TM AS endTm , B.LRN_TM AS lrnTm , B.DIV_CD AS divCd , B.TRGT AS trgt , B.PRSNL AS prsnl + /* , DATE_FORMAT(B.FRST_REGIST_PNTTM,'%Y-%m-%d') AS frstRegistPnttm + */ + , TO_CHAR(B.FRST_REGIST_PNTTM,'YYYY-MM-DD') AS frstRegistPnttm , B.FRST_REGISTER_ID AS frstRegisterId + /* , DATE_FORMAT(B.LAST_UPDT_PNTTM,'%Y-%m-%d') AS lastUpdtPnttm + */ + , TO_CHAR(B.LAST_UPDT_PNTTM,'YYYY-MM-DD') AS lastUpdtPnttm , B.LAST_UPDUSR_ID AS lastUpdusrId , B.LRN_SBJCT AS lrnSbjct , B.LRN_CN AS lrnCn diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctCnfrmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctCnfrmMngDetail.jsp index 4b520c75..192d6963 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctCnfrmMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAplctCnfrmMngDetail.jsp @@ -170,6 +170,20 @@ ${info.email} + + +

신청내용

+ + + + + + + + + + +

희망주제

diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp index 71a0b22b..071c7d05 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduAsgnmCnfrmMngDetail.jsp @@ -350,6 +350,20 @@ ${info.email} + + +

신청내용

+ + + + + + + + + + +

희망주제

@@ -375,7 +389,8 @@
-

교육차시 정보

(*이동거리는 교육장소부터 강사주소까지의 거리를 TMAP API를 이용하여 계산하였습니다.) +

교육차시 정보

+
@@ -384,8 +399,8 @@ - - +<%-- --%> +<%-- --%> @@ -394,8 +409,8 @@ - - + + @@ -433,6 +448,7 @@ + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp index d73e82da..675eb3e8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/instrInfo/instrPrflDetail.jsp @@ -666,7 +666,7 @@ --> - +
대상 배정강사 인원이동거리숙박신청정보