diff --git a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java index d45ffa0c..2a9f116b 100644 --- a/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java +++ b/src/main/java/kcc/ve/aplct/comweb/CrownixAjaxController.java @@ -1202,9 +1202,12 @@ public class CrownixAjaxController { jsDrtInfo.put("data_3", p_vEEduChasiVOList.get(i).getLrnSbjct()); //학습주제 jsDrtInfo.put("data_4", p_vEEduChasiVOList.get(i).getLrnCn()); //지도내용 jsDrtInfo.put("data_5", p_vEEduChasiVOList.get(i).getRmrks()); //비고 + + jsDrtInfo.put("data_6", p_vEEduChasiVOList.get(i).getScholInsttNm() + "_" + egovCryptoUtil.decrypt(p_vEEduChasiVOList.get(i).getSearchChrgNm()) + "_차시별 운영계획서"); //학교명 + jsDrtInfo.put("data_7", p_vEEduChasiVOList.get(i).getSearchChrgNm()); //선생님명 jsReqInfo.add(jsDrtInfo); - + /* * "data_1":"4" ,"data_2":"2020년" @@ -1227,6 +1230,8 @@ public class CrownixAjaxController { jsDrtInfo.put("data_5", "-"); //강사 활동 학교명 //i_sumChasi = i_sumChasi + Integer.parseInt(vEInstrDetailVOList.get(i).getLrnTm()); + jsDrtInfo.put("data_6", "-차시별 운영계획서"); //학교명 + jsDrtInfo.put("data_7", "-"); //선생님명 jsReqInfo.add(jsDrtInfo); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java index 03b0afab..6370306e 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduMIXService.java @@ -99,6 +99,8 @@ public interface VEEduMIXService { void updateAplctStateCd(VEEduAplctVO vEEduAplctVO); void updateEduStateCd(VEEduAplctVO vEEduAplctVO); + + void updateAplctEmail(VEEduAplctVO vEEduAplctVO); List selectTrgtList(VEEduAplctVO paramVO); diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java index 9a346b0b..60abcb2c 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXDAO.java @@ -254,6 +254,10 @@ public class VEEduMIXDAO extends EgovAbstractDAO { update("VEEduMIXDAO.updateEduStateCd", paramVO); } + public void updateAplctEmail(VEEduAplctVO paramVO) { + update("VEEduMIXDAO.updateAplctEmail", paramVO); + } + public void updateCnclStatus(VEEduAplctVO vEEduAplctVO) { update("VEEduMIXDAO.updateCnclStatus", vEEduAplctVO); } diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java index 3789d502..6600d6a7 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduMIXServiceImpl.java @@ -226,6 +226,12 @@ public class VEEduMIXServiceImpl implements VEEduMIXService { } + @Override + public void updateAplctEmail(VEEduAplctVO paramVO) { + vEEduMIXDAO.updateAplctEmail(paramVO); + + } + public List selectExprnHstryPagingList(VEEduAplctVO paramVO) throws Exception{ return vEEduMIXDAO.selectExprnHstryPagingList(paramVO); } 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 e12f0f6d..de0f0eee 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java @@ -1372,6 +1372,57 @@ public class CndtnPrcsInfoMngController { return modelAndView; } + + /** + * @methodName : updateAplctStateCdAjax + * @author : 이호영 + * @date : 2024.01.11 + * @description : 연기상태 udpate + * @param vEEduAplctVO + * @param model + * @param request + * @return + * @throws Exception + */ + @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/updateAplctEmailAjax.do") + public ModelAndView updateAplctEmailAjax( + @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO + , ModelMap model + , HttpServletRequest request + ) throws Exception { + + ModelAndView modelAndView = new ModelAndView("jsonView"); + + try { + //로그인 처리==================================== + //로그인 정보 가져오기 + + 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 로그인 정보 가져오기 + + // 기소유예 대상자 상태값 udpate + vEEduAplctVO = egovCryptoUtil.encryptVEEduAplctVOInfo(vEEduAplctVO); + vEEduMIXService.updateAplctEmail(vEEduAplctVO); + + + modelAndView.addObject("result", "success"); + } catch (Exception e) { + modelAndView.addObject("result", ""); + } + + + + + return modelAndView; + + } /** * @methodName : updateAplctStateCdAjax 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 73cf510a..00b4079e 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 @@ -4472,6 +4472,7 @@ , D.ADDR AS iAddr , A.EDU_PRSNL AS eduPrsnl , A.schol_instt_nm AS scholInsttNm + , A.chrg_nm AS searchChrgNm , A.edu_place AS eduPlace , A.edu_place_cd AS eduPlaceCd , A.INSTT_NM AS InsttNm @@ -7810,7 +7811,19 @@ VALUES sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd# + + + /* VEEduMIXDAO.AplctEmail */ + + UPDATE + ve_edu_aplct + SET + email = #email# + WHERE + edu_aplct_ord = #eduAplctOrd# + + +
+ + +
@@ -734,12 +769,12 @@ - + - + - + <%-- --%> @@ -781,7 +816,11 @@ - + + diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngDetail.jsp index 4ed10718..81f041b4 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnStateMngDetail.jsp @@ -777,7 +777,8 @@ viewer.hideToolbarItem(["save"]); viewer.showToolbarItem(["print_pdf"]); //viewer.openFile('exprn_plan_20240214.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/adultVisitEdu/eduAplct/instrActivityAjax.do?p_userId='+v_userId+'&p_instrDetailActvtHstryOrd='+p_instrDetailActvtHstryOrd+']'); - viewer.openFile('exprn_plan_20240214.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/cpyrgExprnClsrm/exprnPlanAjax.do?p_eduAplctOrd='+p_eduAplctOrd+']'); + //viewer.openFile('exprn_plan_20240214.mrd', '/rf [http://119.193.215.98:9989/offedu/ve/aplct/cpyrgExprnClsrm/exprnPlanAjax.do?p_eduAplctOrd='+p_eduAplctOrd+']'); + viewer.openFile('exprn_plan_20240214.mrd', '/rf [http://192.168.0.32:3080/offedu/ve/aplct/cpyrgExprnClsrm/exprnPlanAjax.do?p_eduAplctOrd='+p_eduAplctOrd+']'); } }