diff --git a/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java b/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java
index 830e8a68..5730a010 100644
--- a/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java
+++ b/src/main/java/kcc/ve/oprtn/comweb/CommonManageWebController.java
@@ -354,6 +354,23 @@ public class CommonManageWebController {
return modelAndView;
}
+ @RequestMapping(value="/eduAplctDeleteAjax.do")
+ public ModelAndView eduAplctDeleteAjax(HttpServletRequest request
+ , ModelMap model
+ , VEEduAplctVO vEEduAplctVO) throws Exception {
+ ModelAndView modelAndView = new ModelAndView();
+ modelAndView.setViewName("jsonView");
+
+ //권한에 따른 로그인 정보 가져오기
+ LoginVO loginVO = checkLoginUtil.getAuthLoginVO();
+ vEEduAplctVO.setLastUpdusrId(loginVO.getUniqId());
+ int rs = vEEduAplctService.delete(vEEduAplctVO);
+
+ modelAndView.addObject("rsCnt", rs);
+ modelAndView.addObject("result", "success");
+ return modelAndView;
+ }
+
//교육신청 리스트에서 일괄 상태변경 처리
@RequestMapping(value="/eduAplctStatusListAjax.do")
public ModelAndView eduAplctStatusListAjax(HttpServletRequest request , ModelMap model , VEEduAplctVO veEduAplctVO) throws Exception {
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 f50f3722..e2fafe38 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
@@ -471,6 +471,7 @@
AND TO_CHAR(A.req_pnttm, 'YYYYMMDD') REPLACE(#searchSmbtEndDt#, '.' , '')
+
/* 관할청 멀티셀렉트 */
@@ -479,6 +480,15 @@
#searchSelStatusList[]#
+
+
+
+
+ AND a.cmptnt_athrt like #srchCndt2#||'%'
+
+
+
+
ORDER BY
a.req_pnttm DESC
diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
index ce9b3560..0c575066 100644
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
@@ -1081,7 +1081,7 @@
DELETE FROM
WHERE
- a.edu_aplct_ord = #eduAplctOrd#
+ edu_aplct_ord = #eduAplctOrd#
diff --git a/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Tibero.xml
index 9ee2918e..29f6b5cf 100644
--- a/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/qustnr/VEALettnQestnrMIX_SQL_Tibero.xml
@@ -226,15 +226,37 @@
FROM LETTNQESTNRINFO a
, LETTNQUSTNRQESITM b
- LEFT OUTER join LETTNQESTNRRSLTDetail c
+ LEFT OUTER join (
+
+ SELECT c02.*
+ FROM (
+ SELECT
+ c00.qustnr_tmplat_id
+ , c00.qestnr_id
+ , c00.qustnr_qesitm_id
+ , max(c00.qustnr_rslt_id) AS qustnr_rslt_id
+ FROM
+ LETTNQESTNRRSLTDetail c00
+ WHERE
+ c00.EDU_APLCT_ORD = #eduAplctOrd#
+ AND c00.EDU_CHASI_ORD = #eduChasiOrd#
+ GROUP BY
+ c00.qustnr_tmplat_id
+ , c00.qestnr_id
+ , c00.qustnr_qesitm_id
+ )c01
+ , LETTNQESTNRRSLTDetail c02
+ WHERE c01.qustnr_tmplat_id=c02.qustnr_tmplat_id
+ AND c01.qestnr_id=c02.qestnr_id
+ AND c01.qustnr_qesitm_id=c02.qustnr_qesitm_id
+ AND c01.qustnr_rslt_id=c02.qustnr_rslt_id
+
+ ) c
on(
b.QUSTNR_TMPLAT_ID =c.QUSTNR_TMPLAT_ID
AND b.QESTNR_ID =c.QESTNR_ID
AND b.QUSTNR_QESITM_ID =c.QUSTNR_QESITM_ID
- AND c.EDU_APLCT_ORD = #eduAplctOrd#
- AND c.EDU_CHASI_ORD = #eduChasiOrd#
-
)
/*
LEFT OUTER JOIN LETTNQUSTNRRESPONDINFO d
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp
index 3fc41027..3354b3b8 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngList.jsp
@@ -97,7 +97,13 @@
searchOptions = $("#searchSelStatusTemp").html();
+ //지역에 이전 선택값이 나오도록
+ if ('${cndtnTrgtInfoMngVO.srchCndt2 }'!=''){
+ $("#srchCndt2").val('${cndtnTrgtInfoMngVO.srchCndt2 }').prop("selected", true); //값이 1인 option 선택
+ }
+
+ //관할지청에 지역에 선택된 지역의 값만 나오도록
$('.select2-selection').click( function(){
//alert( 'test' );
srchCndt2Chg2();
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp
index 491a8f2d..443c4eb8 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp
@@ -60,6 +60,30 @@
});
}
}
+
+ function fncGoDel(){
+
+ if(confirm("삭제 하시겠습니까?\n복구할수없습니다.")){
+ $.ajax({
+ type:"POST",
+ url:"${pageContext.request.contextPath}/kccadr/oprtn/comm/eduAplctDeleteAjax.do",
+ data: {
+ "eduAplctOrd" : $("#eduAplctOrd").val()
+ },
+ dataType:'json',
+ success:function(returnData){
+ if(returnData.rsCnt > 0){
+ alert("삭제 되었습니다.");
+ fncGoList();
+ }
+ },
+ error:function(request , status, error){
+ alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+ }
+ });
+ }
+ }
+
//교육 선정여부 수정 로직
function fncChsChange(flag) {
if(confirm("선정여부를 변경 하시겠습니까?")){
@@ -535,14 +559,17 @@
-
+
-
+
+
+
+