diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java index 37b0da51..34168f95 100644 --- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java +++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java @@ -478,58 +478,63 @@ public class FndtnEnhanceTrnController { , HttpServletRequest request ) throws Exception { - - // 확인 체크 - if(StringUtils.isNotEmpty(vEPrcsDetailVO.getCmmNotifyOrd())) - { - notifyManageService.updateNotifyChkWhereCmmNotifyOrd(vEPrcsDetailVO.getCmmNotifyOrd()); - } + try { + // 확인 체크 + if(StringUtils.isNotEmpty(vEPrcsDetailVO.getCmmNotifyOrd())) + { + notifyManageService.updateNotifyChkWhereCmmNotifyOrd(vEPrcsDetailVO.getCmmNotifyOrd()); + } - - - - //로그인 처리==================================== - LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 - SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 - - /* - if (loginVO == null || ssoLoginVO == null) { - //이전 url 처리(beforeSiteUrl)_이준호_220228추가 - return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다. - } - */ - - //1.pageing step1 - //과정 조회 - VEPrcsDetailVO vEPrcsDetailVODetail = vEPrcsAplctPrdService.selectDetailNewOne4Fndth(vEPrcsDetailVO); - VEEduAplctVO vEEduAplctReqVO = new VEEduAplctVO(); - - try { - vEEduAplctReqVO.setUserId(loginVO.getUniqId()); - model.addAttribute("userSe", "Y"); - }catch(Exception ex) { - model.addAttribute("userSe", "N"); - ex.printStackTrace(); - } - - vEEduAplctReqVO.setLctrDivCd(vEPrcsDetailVODetail.getLctrDivCd()); - vEEduAplctReqVO.setPrcsAplctPrdOrd(vEPrcsDetailVODetail.getPrcsAplctPrdOrd()); - vEEduAplctReqVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_50); - VEEduAplctVO vEEduAplctVO = fndtnEnhanceTrnService.findByAprvlCd(vEEduAplctReqVO); - // VO를 먼저 null 체크 후 진행해야 에러안남 - // vEEduAplctVO != null && - if(vEEduAplctVO != null && StringUtils.isNotEmpty(vEEduAplctVO.getAprvlCd())) { - vEPrcsDetailVODetail.setAprvlCd(vEEduAplctVO.getAprvlCd()); - } + + + + //로그인 처리==================================== + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + /* + if (loginVO == null || ssoLoginVO == null) { + //이전 url 처리(beforeSiteUrl)_이준호_220228추가 + return checkLoginUtil.getUserLoginPage(model, request); //로그인 정보가 없으면 로그인 페이지로 이동한다. + } + */ + + //1.pageing step1 + //과정 조회 + VEPrcsDetailVO vEPrcsDetailVODetail = vEPrcsAplctPrdService.selectDetailNewOne4Fndth(vEPrcsDetailVO); + VEEduAplctVO vEEduAplctReqVO = new VEEduAplctVO(); + + try { + vEEduAplctReqVO.setUserId(loginVO.getUniqId()); + model.addAttribute("userSe", "Y"); + }catch(Exception ex) { + model.addAttribute("userSe", "N"); + ex.printStackTrace(); + } + + vEEduAplctReqVO.setLctrDivCd(vEPrcsDetailVODetail.getLctrDivCd()); + vEEduAplctReqVO.setPrcsAplctPrdOrd(vEPrcsDetailVODetail.getPrcsAplctPrdOrd()); + vEEduAplctReqVO.setLctrDivCd(VeConstants.LCTR_DIV_CD_50); + VEEduAplctVO vEEduAplctVO = fndtnEnhanceTrnService.findByAprvlCd(vEEduAplctReqVO); + // VO를 먼저 null 체크 후 진행해야 에러안남 + // vEEduAplctVO != null && + if(vEEduAplctVO != null && StringUtils.isNotEmpty(vEEduAplctVO.getAprvlCd())) { + vEPrcsDetailVODetail.setAprvlCd(vEEduAplctVO.getAprvlCd()); + } + + VEPrcsDetailVO vEPrcsEtcDetail = vEPrcsAplctPrdService.selectEtc(vEPrcsDetailVODetail.getPrcsAplctPrdOrd()); + if(vEPrcsEtcDetail != null) + { + vEPrcsDetailVODetail.setPrpsCn(vEPrcsEtcDetail.getPrpsCn()); + vEPrcsDetailVODetail.setChrctCn(vEPrcsEtcDetail.getChrctCn()); + vEPrcsDetailVODetail.setPrcsAplctPrdEtcOrd(vEPrcsEtcDetail.getPrcsAplctPrdEtcOrd()); + } + model.addAttribute("info", vEPrcsDetailVODetail); + }catch(Exception ex) { + ex.printStackTrace(); + } + - VEPrcsDetailVO vEPrcsEtcDetail = vEPrcsAplctPrdService.selectEtc(vEPrcsDetailVODetail.getPrcsAplctPrdOrd()); - if(vEPrcsEtcDetail != null) - { - vEPrcsDetailVODetail.setPrpsCn(vEPrcsEtcDetail.getPrpsCn()); - vEPrcsDetailVODetail.setChrctCn(vEPrcsEtcDetail.getChrctCn()); - vEPrcsDetailVODetail.setPrcsAplctPrdEtcOrd(vEPrcsEtcDetail.getPrcsAplctPrdEtcOrd()); - } - model.addAttribute("info", vEPrcsDetailVODetail); return "/web/ve/aplct/fndtnEnhanceTrn/eduAplctDetail"; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java index 442eeb97..b0a35fab 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/asgnmInfo/service/VEInstrAsgnmVO.java @@ -19,6 +19,7 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable { private String eduChasiOrd; //교육차시순번 private String userId; //사용자아이디 + private String euserId; //사용자아이디(강의요청자 ID) private String userNm; //사용자명(강사) private String pnltyCd; //패널티코드 private String pnltyPnttm; //패널티일시 @@ -866,5 +867,11 @@ public class VEInstrAsgnmVO extends ComDefaultVO implements Serializable { public void setFoodExpenses(String foodExpenses) { this.foodExpenses = foodExpenses; } + public String getEuserId() { + return euserId; + } + public void setEuserId(String euserId) { + this.euserId = euserId; + } } diff --git a/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml index 1e1f0f3f..99497a0b 100644 --- a/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/let/cmm/fms/EgovFile_SQL_Tibero.xml @@ -42,6 +42,10 @@ SELECT a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM, b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT + + , '' AS scholInsttNm + , '' AS chrgNm + FROM LETTNFILE a, LETTNFILEDETAIL b WHERE 1=1 @@ -60,6 +64,10 @@ SELECT a.ATCH_FILE_ID, b.FILE_CN, b.FILE_SN, b.FILE_STRE_COURS, b.STRE_FILE_NM, b.FILE_EXTSN, b.ORIGNL_FILE_NM, b.FILE_SIZE, TO_CHAR(a.CREAT_DT, 'YYYY-MM-DD HH24:MI:SS' ) AS CREAT_DT + + , '' AS scholInsttNm + , '' AS chrgNm + FROM LETTNFILE a, LETTNFILEDETAIL b WHERE @@ -219,7 +227,11 @@

교육일시

- ${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일 +<%-- ${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일 --%> + ${info.eduHopeDt}

차시

@@ -143,8 +144,8 @@

교육일시

- - ${fn:substring(info.eduHopeDt,0,4)}년 ${fn:substring(info.eduHopeDt,4,6)}월 ${fn:substring(info.eduHopeDt,6,8)}일 + + ${info.eduHopeDt} @@ -184,18 +185,19 @@ ${info.addr} - + -

교육내용

+

교육장소

- - - - - ${eduList.prcsNm}
- - + + + ${info.eduPlace} + + + + - +

교육대상

@@ -252,12 +254,6 @@ ${info.email} - - -

신청마감일

- - - - @@ -270,7 +266,9 @@
- + + +