diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java index 1f220566..ea0e7f93 100644 --- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java +++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java @@ -533,12 +533,79 @@ public class SspnIdtmtController { model.addAttribute("info", vEPrcsDetailVODetail); + model.addAttribute("infoAplctOrd", vEEduAplctVO); return "/web/ve/aplct/sspnIdtmt/eduAplctDetail"; } + + //사용자 교육취소 + //교육 상태코드, 교육 선정여부 수정 로직 + @RequestMapping(value="/web/ve/aplct/sspnIdtmt/eduAplctDelete4UserAjax.do") + public ModelAndView eduAplctDelete4UserAjax( HttpServletRequest request , ModelMap model + , VEEduAplctVO vEEduAplctVO) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + //로그인 처리==================================== + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request); + if (!"".equals(s_userCheckNInfo)) { + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + + System.out.println("vEEduAplctVO"); + System.out.println(vEEduAplctVO.getPrcsAplctPrdOrd()); + System.out.println(vEEduAplctVO.getUserId()); + System.out.println(vEEduAplctVO.getEduAplctOrd()); + + int rs = vEEduAplctService.userDelete(vEEduAplctVO); + //vEEduAplctVO.setLastUpdusrId(loginVO.getUniqId()); + //int rs = vEEduAplctService.statusUpdate(vEEduAplctVO); + + modelAndView.addObject("rsCnt", rs); + modelAndView.addObject("result", "success"); + return modelAndView; + } + + //사용자 교육취소요청 + //교육 상태코드, 교육 선정여부 수정 로직 + @RequestMapping(value="/web/ve/aplct/sspnIdtmt/eduAplctCancelRequest4UserAjax.do") + public ModelAndView eduAplctCancelRequest4UserAjax( HttpServletRequest request , ModelMap model + , VEEduAplctVO vEEduAplctVO) throws Exception { + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + //로그인 처리==================================== + LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기 + SsoLoginVO ssoLoginVO = checkLoginUtil.getSSOLoginVO(request); //SSO 로그인 정보 가져오기 + + String s_userCheckNInfo = checkLoginUtil.userCheckNInfo(model, request); + if (!"".equals(s_userCheckNInfo)) { + modelAndView.addObject("result", "loginFail"); + return modelAndView; + } + + System.out.println("vEEduAplctVO"); + System.out.println(vEEduAplctVO.getPrcsAplctPrdOrd()); + System.out.println(vEEduAplctVO.getUserId()); + System.out.println(vEEduAplctVO.getEduAplctOrd()); + + vEEduAplctVO.setAprvlCd("35"); //35-취소요청-VEA0003 + + int rs = vEEduAplctService.update(vEEduAplctVO); + //vEEduAplctVO.setLastUpdusrId(loginVO.getUniqId()); + //int rs = vEEduAplctService.statusUpdate(vEEduAplctVO); + + modelAndView.addObject("rsCnt", rs); + modelAndView.addObject("result", "success"); + return modelAndView; + } + /** * 기반강화연수과정 신청기간 등록 */ diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java index a4b64391..edc2bae3 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/VEEduAplctService.java @@ -31,6 +31,9 @@ public interface VEEduAplctService { //D int delete(VEEduAplctVO paramVO) throws Exception; + + //cancel - 기소유예 사용자 취소 + int userDelete(VEEduAplctVO paramVO) throws Exception; //L List selectList(VEEduAplctVO paramVO) throws Exception; diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java index e1b99cd4..9dbb0e56 100644 --- a/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java +++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/eduInfo/service/impl/VEEduAplctServiceImpl.java @@ -14,6 +14,8 @@ import kcc.com.cmm.service.impl.CmmUseDAO; import kcc.let.utl.fcc.service.EgovCryptoUtil; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctService; import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.CndtnTrgtMngVO; +import kcc.ve.oprtn.cndtnSspnIdtmt.trgtMng.service.impl.CndtnTrgtMngDAO; @Service("vEEduAplctService") public class VEEduAplctServiceImpl implements VEEduAplctService { @@ -27,7 +29,11 @@ public class VEEduAplctServiceImpl implements VEEduAplctService { //암복호화 유틸 @Resource(name = "egovCryptoUtil") EgovCryptoUtil egovCryptoUtil; - + + //기소유예 + @Resource(name="cndtnTrgtInfoMngDAO") + private CndtnTrgtMngDAO cndtnTrgtInfoMngDAO; + //C public void insert(VEEduAplctVO paramVO) throws Exception { @@ -74,6 +80,18 @@ public class VEEduAplctServiceImpl implements VEEduAplctService { return vEEduAplctDAO.delete(paramVO); } + //기소유예 - 사용자 삭제 + public int userDelete(VEEduAplctVO paramVO) throws Exception{ + //step1.vea_sspn_idmt_trgt 테이블 edu_aplct_ord null 처리 + //step2.ve_edu_aplct 삭제 + CndtnTrgtMngVO cndtnTrgtMngVO = new CndtnTrgtMngVO(); + cndtnTrgtMngVO.setEduAplctOrd(paramVO.getEduAplctOrd()); + cndtnTrgtInfoMngDAO.updateUserIdCancel(cndtnTrgtMngVO); + + return vEEduAplctDAO.delete(paramVO); + } + + //List public List selectList(VEEduAplctVO paramVO) throws Exception{ return vEEduAplctDAO.selectList(paramVO); diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java index 12066bbb..fdd5e7f8 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngService.java @@ -23,6 +23,8 @@ public interface CndtnTrgtMngService { void update(CndtnTrgtMngVO cndtnTrgtInfoMngVO); void updateUserId(CndtnTrgtMngVO cndtnTrgtMngVO); + + void updateUserIdCancel(CndtnTrgtMngVO cndtnTrgtMngVO); int findCntreqNmber(String reqNmbrTemp); diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java index 502170b1..1d0c2fd9 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngDAO.java @@ -138,6 +138,10 @@ public class CndtnTrgtMngDAO extends EgovAbstractDAO { update("cndtnTrgtInfoMngDAO.updateUserId", cndtnTrgtMngVO); } + public void updateUserIdCancel(CndtnTrgtMngVO cndtnTrgtMngVO) { + update("cndtnTrgtInfoMngDAO.updateUserIdCancel", cndtnTrgtMngVO); + } + public String findByTrgtNmAndDBirthAndUserIdAndEduStateCd(CndtnTrgtMngVO cndtnTrgtInfoMngVO) { return (String) select("cndtnTrgtInfoMngDAO.findByTrgtNmAndDBirthAndUserIdAndEduStateCd", cndtnTrgtInfoMngVO); } diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java index 6e7e49c0..f5036b19 100644 --- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java +++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/impl/CndtnTrgtMngServiceImpl.java @@ -69,6 +69,11 @@ public class CndtnTrgtMngServiceImpl implements CndtnTrgtMngService { cndtnTrgtInfoMngDAO.updateUserId(cndtnTrgtMngVO); } + @Override + public void updateUserIdCancel(CndtnTrgtMngVO cndtnTrgtMngVO) { + cndtnTrgtInfoMngDAO.updateUserIdCancel(cndtnTrgtMngVO); + } + @Override public int findCntreqNmber(String reqNmbrTemp) { return cndtnTrgtInfoMngDAO.findCntreqNmber(reqNmbrTemp); diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml index 02e6cc42..7d5e53ee 100644 --- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml +++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml @@ -415,7 +415,21 @@ WHERE sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd# - + + + + /* cndtnTrgtInfoMngDAO.updateSspnIdtmtTrgtOrd */ + UPDATE + + SET + user_id = NULL + , edu_aplct_ord = NULL + , edu_state_cd = '10' + , prcs_aplct_prd_ord_cmplt = NULL + WHERE + edu_aplct_ord = #eduAplctOrd# + +