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 c2c12310..a4a4c2dd 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 @@ -189,7 +189,18 @@ vsit.trgt_nm AS trgtNm, vsit.sspn_idtmt_trgt_ord AS sspnIdtmtTrgtOrd, vsit.clphone AS vs_clphone, - vsit.d_birth AS dBirth + vsit.d_birth AS dBirth , + CASE + WHEN EXISTS (/* 설문조사 */ + SELECT + 1 + FROM + LETTNQESTNRRSLTDETAIL lersltD + WHERE + lersltD.respond_id = a.USER_ID + AND a.edu_aplct_ord = lersltD.edu_aplct_ord ) THEN 1 + ELSE 0 + END AS qestRsltExists FROM a JOIN ve_prcs_aplct_prd vpap ON @@ -229,6 +240,7 @@ AND a.use_yn = 'Y' + AND a.aprvl_cd != '40' /* 취소된 내역 안 보여줌 */ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnInstrMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnInstrMngList.jsp index d0e03fa0..87a0dc02 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnInstrMngList.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnInstrMngList.jsp @@ -205,7 +205,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp index e0c2f140..2091c9e6 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctCfnMngDetail.jsp @@ -255,7 +255,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp index 83c1535c..dc772af8 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngMdfy.jsp @@ -183,7 +183,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngReg.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngReg.jsp index 32308dfc..782395c3 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/fndthEduPrcsAplctPrdMngReg.jsp @@ -191,7 +191,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup.jsp index 0dc4e1cf..7288f771 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/fndthEnhanceTrn/popup/lctrEvalPopup.jsp @@ -36,7 +36,7 @@ type:"POST" ,url:"${pageContext.request.contextPath}/web/ve/aplct/fndtnEnhanceTrn/selectQustnrCommonAjax.do" ,data: { - "lctrDivCd" : "50" // 기반강화 -> 기소유예(60)도 같이써야함 + "lctrDivCd" : "60" // 기반강화 -> 기소유예(60)도 같이써야함 // ,"eduChasiOrd" : chId } ,dataType:'json' @@ -168,7 +168,7 @@ if(returnData.result == 'success'){ alert("설문결과가 수정 되었습니다."); - self.close(); + location.reload(); }else if(returnData.result == 'fail'){ alert(returnData.msg); location.href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do?test=test"; @@ -200,7 +200,7 @@ alert("설문결과가 삭제 되었습니다."); window.opener.location.reload(); - self.close(); + fncPopClose(); }else if(returnData.result == 'fail'){ alert(returnData.msg); // location.href="${pageContext.request.contextPath}/web/user/login/ssoLogin.do?test=test"; @@ -212,13 +212,16 @@ }); } } - + + function fncPopClose(){ + self.close(); + } - + "> "> ">
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp index 24a4cc3a..bea0b9d4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp @@ -363,30 +363,6 @@ $(document).ready(function(){
-
-
-
이달의 과정
-
-
- -
-
- -
- - -
- - -
    -
  • -
  • ~
  • -
  • -
-
-
-
-