diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java index ba671658..81369646 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -166,7 +166,9 @@ public class CndtnPrcsInfoMngController { @Resource(name = "checkFileUtil") private CheckFileUtil checkFileUtil; - + //교육신청순번 + @Resource(name="eduAplctGnrService") + private EgovIdGnrService eduAplctGnrService; /** * 기반강화연수 과정 관리 목록 화면 @@ -2155,8 +2157,8 @@ public class CndtnPrcsInfoMngController { @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/popup/cndtnApplyAsgnmPopup.do") public String fndthApplyAsgnmPopup( // @ModelAttribute("vEInstrDetailVO") VEInstrDetailVO vEInstrDetailVO - //@ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO - @ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , @ModelAttribute("cndtnTrgtInfoMngVO") CndtnTrgtMngVO cndtnTrgtInfoMngVO , ModelMap model , RedirectAttributes redirectAttributes @@ -2231,11 +2233,117 @@ public class CndtnPrcsInfoMngController { //대상 리스트, 페이징 정보 전달 model.addAttribute("list", cndtnTrgtInfoMngVOList); - return "/oprtn/cndtnSspnIdtmt/popup/cndtnApplyAsgnmPopup"; } + /** + * 기반강화연수과정 신청기간 등록 + */ + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/popup/eduRegAjax.do") + public ModelAndView fndthEduPrcsAplctPrdMngRegAjax( + @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO + , ModelMap model + + + + +// ㄴㅇㄹㄴㅇㄹㄴㅇㄹ + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + //로그인 정보 가져오기 + + + + + /* + String s_oprtnLoginCheckNInfo = checkLoginUtil.oprtnCheckNInfo(model); + if (!"".equals(s_oprtnLoginCheckNInfo)) { + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + + //로그인 처리==================================== + * + */ + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + //SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + + + VEEduAplctVO vEEduAplctVO = new VEEduAplctVO(); + String s_eduAplctOrd = eduAplctGnrService.getNextStringId(); + vEEduAplctVO.setEduAplctOrd(s_eduAplctOrd); + + vEEduAplctVO.setLctrDivCd(LCTR_DIV_CD); // 기소유예 + vEEduAplctVO.setAprvlCd("10"); // 승인코드 VE0003 10 - 요청, 20 - 승인, 30 - 반려 +// sbmt_pnttm 제출일시 + vEEduAplctVO.setSbmtYn("Y"); // 제출여부 + vEEduAplctVO.setFrstRegisterId(loginVO.getUniqId()); +// frst_regist_pnttm + vEEduAplctVO.setUserId(loginVO.getUniqId()); + vEEduAplctVO.setPrcsOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd()); + vEEduAplctVO.setTrgtNm(vEPrcsDetailVO.getTrgtNm()); + vEEduAplctVO.setdBirth(vEPrcsDetailVO.getdBirth()); + vEEduAplctVO.setPhone(egovCryptoUtil.encrypt(vEPrcsDetailVO.getPhone())); + vEEduAplctVO.setEmail(vEPrcsDetailVO.getEmail()); + + String result = ""; + try { + //암호화 + vEEduAplctVO = egovCryptoUtil.encryptVEEduAplctVOInfo(vEEduAplctVO); + vEEduAplctVO.setRndsOrd(vEPrcsDetailVO.getSspnIdtmtTrgtOrd()); //2024-02-07 추가 신청서 정보에 대상자 정보를 넣어야 추후 구분이 가능해서 추가함 + sspnIdtmtService.insertVeEduAplct(vEEduAplctVO); + + + CndtnTrgtMngVO cndtnTrgtMngVO = new CndtnTrgtMngVO(); + + cndtnTrgtMngVO.setUserId(loginVO.getUniqId()); + cndtnTrgtMngVO.setSspnIdtmtTrgtOrd(vEPrcsDetailVO.getSspnIdtmtTrgtOrd()); + cndtnTrgtMngVO.setEduStateCd("25"); // 신청 + + cndtnTrgtMngVO.setEduAplctOrd(s_eduAplctOrd); //동일한 대상자가 어떤 신청서와 맞는지 매칭에 필요함 + + //cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(vEPrcsDetailVO.getPrcsAplctPrdOrd()); // 교육 번호 +// , edu_state_cd = #eduStateCd# +// , prcs_aplct_prd_ord_cmplt = #prcsAplctPrdOrdCmplt# + + + cndtnTrgtInfoMngService.updateUserId(cndtnTrgtMngVO); + + //알림 교육신청 + try { + iTNotiUtil.insertNotifyNew_60( + LCTR_DIV_CD, //"60", + loginVO.getUniqId(), + VeConstants.NOTI_STATUS_10, + vEPrcsDetailVO.getPrcsAplctPrdOrd(), + "", + "1", + "1" + ); + }catch(Exception ex) { + ex.printStackTrace(); + } + + result = "success"; + } catch (Exception e) { + // TODO: handle exception + } + + + + modelAndView.addObject("result", result); + + return modelAndView; + + } + /** * @methodName : cnclPopup * @author : 이호영 diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Postgresql.xml index 27a36594..b392aa69 100644 --- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Postgresql.xml +++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Postgresql.xml @@ -503,9 +503,14 @@ a.PRCS_ORD = vpap.PRCS_APLCT_PRD_ORD LEFT JOIN VEA_APLCT_DETAIL_INFO vadi ON a.EDU_APLCT_ORD = vadi.EDU_APLCT_ORD - /* AND vpap.PRCS_APLCT_PRD_ORD = vadi.PRCS_APLCT_PRD_ORD */ - JOIN LETTNGNRLMBER le ON + /* AND vpap.PRCS_APLCT_PRD_ORD = vadi.PRCS_APLCT_PRD_ORD */ + + LEFT JOIN LETTNGNRLMBER le ON a.USER_ID = le.ESNTL_ID + + LEFT JOIN lettnemplyrinfo le2 ON + a.USER_ID = le2.ESNTL_ID + LEFT JOIN VEA_SSPN_IDMT_TRGT vsit ON ( /* 신청 정보에 대상자 키 값이 들어 있어서 해당 값을만 확인하면 된다.*/ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp index 5f6d9693..86cb25cd 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp @@ -287,7 +287,7 @@ // form.action = ""; form.action = ""; - window.open("#", "_securityPop", "scrollbars = no, top=100px, left=100px, height=750px, width=950px"); + window.open("#", "_securityPop", "scrollbars = no, top=100px, left=0px, height=750px, width=1600px"); form.target = "_securityPop"; form.submit(); } @@ -754,11 +754,13 @@ + + - + (취소-반려) diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnApplyAsgnmPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnApplyAsgnmPopup.jsp index 4b30447d..4b7c9693 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnApplyAsgnmPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnApplyAsgnmPopup.jsp @@ -122,26 +122,25 @@
-

강사검색

+

대상자검색

<%-- <%-- selectedText="${vEEduAplctVO.rsdne}" defaultValue='' --%> <%-- defaultText='전체' --%> <%-- /> --%> -
- +
+
-

강사 목록

(*선호분야 일치여부, 적은 할당시수 순입니다.) +

대상자 목록

(*선호분야 일치여부, 적은 할당시수 순입니다.)
- - + @@ -213,24 +212,19 @@ --> - + <%-- --%> @@ -243,9 +237,9 @@ @@ -288,5 +282,52 @@ + + + + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp index 6cba82b0..76e2fd2d 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp @@ -791,12 +791,7 @@
');" style="cursor:pointer;"> + ');" style="cursor:pointer;"> + - - 완료 - - - - - + (${list.reqStateCd }) 병합처리 - <%-- --%> - ${list.eduStateCdNm } + - + + onclick="fncEduReg('', '', '', ''); return false;">선택
');" style="cursor:pointer;"> - - 완료 - - - - +