diff --git a/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java b/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java index 63eba404..943184a5 100644 --- a/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java +++ b/src/main/java/kcc/ve/aplct/cmdTrgt/web/CmdTrgtController.java @@ -817,7 +817,8 @@ public class CmdTrgtController { */ @RequestMapping("/web/ve/aplct/cmdTrgt/popup/eduCancelPopupAjax.do") public ModelAndView filePopupAjax( - @ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO + @ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO, + @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model //, RedirectAttributes redirectAttributes , HttpServletRequest request @@ -879,7 +880,7 @@ public class CmdTrgtController { //step2.파일 처리==================================== try { - + /* System.out.println("vEEduRprtVO.getAprvlCn()"); System.out.println(vEEduRprtVO.getEduAplctOrd()); System.out.println(vEEduRprtVO.getAprvlCn()); @@ -895,7 +896,16 @@ public class CmdTrgtController { //취소요청 정보 저장 vEEduAplctService.update(vEEduAplctVO); - + */ + /* + 251023 + ve_edu_aplct는 확정 상태 유지. + vea_aplct_detail_info에서 취소 관련 처리 + */ + vEEduAplctVO.setAplctStateCd(VeConstants.EDU_CD_CANCLE_REQ); //취소요청 코드 35 + vEEduAplctVO.setCnclAtchFileId(s_atchFileId); + vEEduAplctVO.setCnclCn(vEEduAplctVO.getAprvlCn()); //취소사유 - 기존에는 aprvlCn 사용 + vEEduMIXService.updateCnclStatus(vEEduAplctVO); }catch(Exception ex) { System.out.println("Exception vEEduRsltRprtService.insert"); diff --git a/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java b/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java index bf49a0b2..d3120228 100644 --- a/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java +++ b/src/main/java/kcc/ve/aplct/prevent/web/PreventController.java @@ -817,7 +817,8 @@ public class PreventController { */ @RequestMapping("/web/ve/aplct/prevent/popup/eduCancelPopupAjax.do") public ModelAndView filePopupAjax( - @ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO + @ModelAttribute("vEEduRprtVO") VEEduRprtVO vEEduRprtVO, + @ModelAttribute("vEEduAplctVO") VEEduAplctVO vEEduAplctVO , ModelMap model //, RedirectAttributes redirectAttributes , HttpServletRequest request @@ -879,7 +880,7 @@ public class PreventController { //step2.파일 처리==================================== try { - + /* System.out.println("vEEduRprtVO.getAprvlCn()"); System.out.println(vEEduRprtVO.getEduAplctOrd()); System.out.println(vEEduRprtVO.getAprvlCn()); @@ -895,7 +896,17 @@ public class PreventController { //취소요청 정보 저장 vEEduAplctService.update(vEEduAplctVO); + */ + /* + 251023 + ve_edu_aplct는 확정 상태 유지. + vea_aplct_detail_info에서 취소 관련 처리 + */ + vEEduAplctVO.setAplctStateCd(VeConstants.EDU_CD_CANCLE_REQ); //취소요청 코드 35 + vEEduAplctVO.setCnclAtchFileId(s_atchFileId); + vEEduAplctVO.setCnclCn(vEEduAplctVO.getAprvlCn()); //취소사유 - 기존에는 aprvlCn 사용 + vEEduMIXService.updateCnclStatus(vEEduAplctVO); }catch(Exception ex) { System.out.println("Exception vEEduRsltRprtService.insert"); diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp index 9622f003..5ca38e43 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -826,7 +826,7 @@ - + <%-- --%> <%-- --%> <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp index e403c254..fd0d892f 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp @@ -826,7 +826,7 @@ - + <%-- --%> <%-- --%> <%-- --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp index 4a0da743..f39a0925 100644 --- a/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/my/myPageDashBoard.jsp @@ -271,7 +271,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduCancelPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduCancelPop.jsp index 290da886..eeb7b037 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduCancelPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cmdTrgt/popup/eduCancelPop.jsp @@ -118,7 +118,7 @@ $.ajax({ type: "POST", enctype: 'multipart/form-data', - url: "${pageContext.request.contextPath}/web/ve/aplct/sspnIdtmt/popup/eduCancelPopupAjax.do", + url: "${pageContext.request.contextPath}/web/ve/aplct/cmdTrgt/popup/eduCancelPopupAjax.do", data: data, dataType:'json', async: false, diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduCancelPop.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduCancelPop.jsp index 290da886..07856b47 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduCancelPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/prevent/popup/eduCancelPop.jsp @@ -118,7 +118,7 @@ $.ajax({ type: "POST", enctype: 'multipart/form-data', - url: "${pageContext.request.contextPath}/web/ve/aplct/sspnIdtmt/popup/eduCancelPopupAjax.do", + url: "${pageContext.request.contextPath}/web/ve/aplct/prevent/popup/eduCancelPopupAjax.do", data: data, dataType:'json', async: false,