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 db9e5064..3d5f6240 100644
--- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
@@ -414,7 +414,51 @@ public class CndtnPrcsInfoMngController {
return "/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngMdfy";
}
-
+ /**
+ * 조건부기소유예 신청기간 삭제 - useYn-D 처리
+ */
+ @RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngDelAjax.do")
+ public ModelAndView cndtnEduPrcsMngDelAjax(
+ @ModelAttribute("vEPrcsDetailVO") VEPrcsDetailVO vEPrcsDetailVO
+ , ModelMap model
+ //, RedirectAttributes redirectAttributes
+ , 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(); //권한에 따른 로그인 정보 가져오기
+
+ VEPrcsDetailVO tvEPrcsDetailVO = new VEPrcsDetailVO();
+ tvEPrcsDetailVO.setPrcsOrd(vEPrcsDetailVO.getPrcsOrd());
+ tvEPrcsDetailVO.setLastUpdusrId(loginVO.getUniqId()); //강의구분코드 VE0011 10-청소년강의, 20-성인강의, 30-체험, 50-기반강화, 60-조건부
+ //tvEPrcsDetailVO.setFrstRegisterId(loginVO.getUniqId()); //esntl_id
+ tvEPrcsDetailVO.setUseYn("D");
+
+ //vEPrcsAplctPrdService.update(tvEPrcsDetailVO);
+
+ vEPrcsDetailVO.setLastUpdusrId(loginVO.getUniqId()); //esntl_id
+ vEPrcsService.update(tvEPrcsDetailVO);
+
+
+ modelAndView.addObject("result", "success");
+
+ return modelAndView;
+
+ }
@RequestMapping("/kccadr/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctMngList.do")
public String cndtnEduPrcsAplctMngList(
diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml
index 34b127a9..eb0ec32f 100644
--- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Tibero.xml
@@ -1068,7 +1068,8 @@
ELSE 0
END AS qestRsltExists,
- a.APRVL_CD AS aprvlCd ,
+ a.APRVL_CD AS aprvlCd,
+ vpap.ddln_cd AS ddlnCd,
vadi.APLCT_STATE_CD AS aplctStateCd,
vadi.CNCL_ATCH_FILE_ID AS cnclAtchFileId,
vadi.CNCL_CN AS cnclCn,
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngDetail.jsp
index 8476d0ea..a706d91b 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsMngDetail.jsp
@@ -44,6 +44,33 @@
detailForm.submit();
}
+ //삭제 - useYn-D 처리
+ function fncDel(){
+ var data = new FormData(document.getElementById("detailForm"));
+ if(confirm("삭제하시겠습니까?\n데이터 복구가 안됩니다.")){
+ var url = "