diff --git a/src/main/java/kcc/com/cmm/web/EgovFileMngController.java b/src/main/java/kcc/com/cmm/web/EgovFileMngController.java index 46776e97..f8990c72 100644 --- a/src/main/java/kcc/com/cmm/web/EgovFileMngController.java +++ b/src/main/java/kcc/com/cmm/web/EgovFileMngController.java @@ -39,6 +39,14 @@ import kcc.ve.instr.tngrVisitEdu.eduInfo.service.VEEduAplctVO; * * */ +/** + * @author User + * + */ +/** + * @author User + * + */ @Controller public class EgovFileMngController { @@ -112,6 +120,15 @@ public class EgovFileMngController { /** * 첨부파일에 대한 삭제를 처리한다. + * + * FILE 삭제에 대한 정리#1 + * + * 1.DB 삭제만 한다. + * DELETE FROM LETTNFILEDETAIL + WHERE + ATCH_FILE_ID = #atchFileId# + AND + FILE_SN = #fileSn# * * @param fileVO * @param returnUrl @@ -120,6 +137,7 @@ public class EgovFileMngController { * @return * @throws Exception */ + @RequestMapping("/cmm/fms/deleteFileInfs1.do") public String deleteFileInf1(@ModelAttribute("searchVO") FileVO fileVO, @RequestParam("returnUrl") String returnUrl, HttpServletRequest request, ModelMap model) throws Exception { @@ -128,6 +146,13 @@ public class EgovFileMngController { if (isAuthenticated) { fileService.deleteFileInf(fileVO); + /* + * DELETE FROM LETTNFILEDETAIL + WHERE + ATCH_FILE_ID = #atchFileId# + AND + FILE_SN = #fileSn# + */ } return "blank"; @@ -150,6 +175,25 @@ public class EgovFileMngController { ////------------------------------------------ } + + /** + * + * * FILE 삭제에 대한 정리#2 + * + * 1.실제 물리 파일 삭제 + * 2.DB 삭제 한다. + * DELETE FROM LETTNFILEDETAIL + WHERE + ATCH_FILE_ID = #atchFileId# + AND + FILE_SN = #fileSn# + * + * @param fileVO + * @param request + * @param model + * @return + * @throws Exception + */ @RequestMapping("/cmm/fms/deleteFileInfs.do") public String deleteFileInf(@ModelAttribute("searchVO") FileVO fileVO , HttpServletRequest request, ModelMap model ) throws Exception { @@ -230,7 +274,14 @@ public class EgovFileMngController { /** * 게시판 첨부파일에 대한 삭제를 처리한다. - * + * FILE 삭제에 대한 정리#3 + * + * 1.DB 삭제 한다. + * DELETE FROM LETTNFILEDETAIL + WHERE + ATCH_FILE_ID = #atchFileId# + AND + FILE_SN = #fileSn# * @param fileVO * @param returnUrl * @param request @@ -354,6 +405,11 @@ public class EgovFileMngController { /** * 저작권 체험교실 결과보고 파일 조회 * + * FILE 삭제에 대한 정리#3 + * + * 0.삭제를 위한 페이지를 호출한다. + * + * * @param fileVO * @param commandMap * @param model @@ -429,6 +485,7 @@ public class EgovFileMngController { * @return * @throws Exception */ + @RequestMapping("/cmm/fms/selectOffeduFile.do") public String selectEduAplctFile(@ModelAttribute("searchVO") FileVO fileVO, @RequestParam Map commandMap, ModelMap model) throws Exception { String atchFileId = (String) commandMap.get("param_atchFileId"); @@ -452,6 +509,7 @@ public class EgovFileMngController { return "cmm/fms/selectEduAplctFile"; } + /* 교육신청관리 첨부파일 삭제 */ @RequestMapping(value = "/cmm/fms/offedufileDeleteAjax.do") public ModelAndView fmsfileDeleteAjax( diff --git a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java index b835c9fd..1c27555b 100644 --- a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java +++ b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduEnd/web/EduEndAdultController.java @@ -221,7 +221,9 @@ public class EduEndAdultController { //2. pageing step2 - vEEduChasiVO = this.setPagingStep2(vEEduChasiVO, paginationInfo); + vEEduChasiVO = this.setPagingStep2(vEEduChasiVO, paginationInfo); + + vEEduChasiVO.setAsgnmAprvlCd("30");//강사 배정된 경우만 완료 목록에 나오도록 List vEEduChasiVOList = vEEduMIXService.selectChasiList(vEEduChasiVO); diff --git a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java index ba7ac518..5542e443 100644 --- a/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java +++ b/src/main/java/kcc/ve/aplct/tngrVisitEdu/eduEnd/web/EduEndTngrController.java @@ -273,6 +273,7 @@ public class EduEndTngrController { //2. pageing step2 vEEduChasiVO = this.setPagingStep2(vEEduChasiVO, paginationInfo); + vEEduChasiVO.setAsgnmAprvlCd("30");//강사 배정된 경우만 완료 목록에 나오도록 //List vEEduAplctVOList = vEEduMIXService.selectPagingList(vEEduAplctVO); List vEEduChasiVOList = vEEduMIXService.selectChasiList(vEEduChasiVO); diff --git a/src/main/java/kcc/ve/cmm/VeSendSMS.java b/src/main/java/kcc/ve/cmm/VeSendSMS.java index e518b3d2..9886f92e 100644 --- a/src/main/java/kcc/ve/cmm/VeSendSMS.java +++ b/src/main/java/kcc/ve/cmm/VeSendSMS.java @@ -97,8 +97,10 @@ public class VeSendSMS { String sender = "055-792-0233"; if("C".equals(sndFlag)) { // 청소년 sender = "055-792-0233"; + sender ="055-792-0224";// 폰번호 }else if("S".equals(sndFlag)) { //성인 sender = "02-2669-0083"; + sender = "055-792-0233"; }else if("G".equals(sndFlag)) { //체험교실 sender = "055-792-0234"; }else if("A".equals(sndFlag)) { //기반강화 diff --git a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java index f640ecd1..bbbabf21 100644 --- a/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java +++ b/src/main/java/kcc/ve/oprtn/pblc/sndMng/web/SndMngController.java @@ -660,7 +660,7 @@ public class SndMngController { " \n" + " \n" + " \n" + - " \"한국저작권위원회-통합회원\n" + + " \"한국저작권위원회-통합회원\n" + " \n" + " \n" + " \n" + @@ -713,7 +713,7 @@ public class SndMngController { " 3. 강사참석확인서: [3] 양식에 강사 날인(온라인의 경우, 강사에게 양식 전달 후, 스캔본 회신)

\n" + " ※ 온라인 교육 시 강의 녹화, 재사용, 배포 등은 저작권법 위반이므로 사전에 강사와 협의가 필요합니다.

\n" + " 1~3 의 요청사항은 교육 후 메일을 통해 회신 부탁 드립니다.(교육 마감 후 일주일 이내)
\n" + - " 기타 문의사항은 한국저작권위원회 교육운영팀 02-2669-0083 으로 연락하여 주시기 바랍니다.

\n" + + " 기타 문의사항은 한국저작권위원회 교육운영팀 055-792-0233 으로 연락하여 주시기 바랍니다.

\n" + " 감사합니다 ^^ \n" + "

\n" + " \n" + @@ -724,7 +724,7 @@ public class SndMngController { " \n" + " \n" + " \n" + - " \"한국저작권위원회-통합회원\n" + + " \"한국저작권위원회-통합회원\n" + " \n" + " \n" + "

본 메일은 발신전용으로 회신하지 않습니다.

\n" + 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 da3793f4..eac6afe1 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 @@ -4172,6 +4172,12 @@ AND A.USER_ID = #userId# + + + AND d0.asgnm_aprvl_cd=#asgnmAprvlCd# /* 강사가 교육확정한 경우만 보여짐 */ + + + /* AND b.EDU_HOPE_DT = ]]> REPLACE(searchStartDt, '.' , '') diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/addRpplPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/addRpplPop.jsp index 1921209e..c63ac1da 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/addRpplPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/addRpplPop.jsp @@ -183,19 +183,9 @@ diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrRpplResPonDentPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrRpplResPonDentPop.jsp index 30725ba9..4006a83e 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrRpplResPonDentPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adrRpplResPonDentPop.jsp @@ -1055,19 +1055,9 @@ function fn_adjReqMgr_update() { @@ -1192,19 +1182,10 @@ function fn_adjReqMgr_update() { @@ -1329,19 +1310,11 @@ function fn_adjReqMgr_update() { @@ -1466,19 +1439,10 @@ function fn_adjReqMgr_update() { @@ -1603,19 +1567,11 @@ function fn_adjReqMgr_update() { diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/popup/addAgntPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/popup/addAgntPop.jsp index b5628bab..ab875367 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/popup/addAgntPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/drt/popup/addAgntPop.jsp @@ -182,19 +182,9 @@ diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegist.jsp index 94cb9965..4b8c82e2 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgr/adjReqMgrRegist.jsp @@ -1590,19 +1590,9 @@ @@ -1793,19 +1783,9 @@ @@ -1933,19 +1913,9 @@ @@ -2069,19 +2039,9 @@ @@ -2205,19 +2165,9 @@ @@ -2341,19 +2291,9 @@ @@ -2477,19 +2417,9 @@ diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp index ea97e496..26031057 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffRegist.jsp @@ -1709,19 +1709,9 @@ function openExampleAdminPop(expmCd) { @@ -1904,19 +1894,9 @@ function openExampleAdminPop(expmCd) { @@ -2035,19 +2015,9 @@ function openExampleAdminPop(expmCd) { @@ -2163,19 +2133,9 @@ function openExampleAdminPop(expmCd) { @@ -2291,19 +2251,9 @@ function openExampleAdminPop(expmCd) { @@ -2419,19 +2369,9 @@ function openExampleAdminPop(expmCd) { @@ -2547,19 +2487,9 @@ function openExampleAdminPop(expmCd) { diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffUpdtView.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffUpdtView.jsp index 1955a303..b838cd4f 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffUpdtView.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjReqMgrOff/adjReqMgrOffUpdtView.jsp @@ -1726,19 +1726,9 @@ @@ -1930,19 +1920,9 @@ @@ -2071,19 +2051,9 @@ @@ -2208,19 +2178,9 @@ @@ -2345,19 +2305,9 @@ @@ -2482,19 +2432,9 @@ @@ -2619,19 +2559,9 @@ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp index 97af1799..c58efc38 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduRsltMngDetail.jsp @@ -441,21 +441,21 @@

결과보고

- - <%-- - + + + - --%> +

강사료

- + diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp index 8ad632d8..9abecea0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqCreate.jsp @@ -332,19 +332,9 @@ input:read-only { diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp index 8a06653d..135930c4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/arc/corReqDetail.jsp @@ -409,18 +409,8 @@ function fn_result(sn){ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/chg/addAgent.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/chg/addAgent.jsp index 97ad7ce3..3c23ad86 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/chg/addAgent.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/accdnt/chg/addAgent.jsp @@ -282,19 +282,9 @@ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/addAdjstReq3RegistFormAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/addAdjstReq3RegistFormAjax.jsp index c41d5f1f..1cfae6fc 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/addAdjstReq3RegistFormAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/addAdjstReq3RegistFormAjax.jsp @@ -126,19 +126,9 @@ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReq2Regist.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReq2Regist.jsp index 67b34270..7b1c3472 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReq2Regist.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReq2Regist.jsp @@ -888,19 +888,9 @@ function fnGoAdjstReq3Page(){ @@ -1075,19 +1065,9 @@ function fnGoAdjstReq3Page(){ diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReq3Regist.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReq3Regist.jsp index f1730de3..86c59254 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReq3Regist.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjst/adjstReq3Regist.jsp @@ -1638,19 +1638,9 @@ $(document).on('click', '.reqPerDel', function(){ @@ -1858,19 +1848,9 @@ $(document).on('click', '.reqPerDel', function(){ @@ -2076,19 +2056,9 @@ $(document).on('click', '.reqPerDel', function(){ @@ -2294,19 +2264,9 @@ $(document).on('click', '.reqPerDel', function(){ @@ -2512,19 +2472,9 @@ $(document).on('click', '.reqPerDel', function(){ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp index 13f1c206..6db8b568 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctDetail.jsp @@ -374,7 +374,7 @@

찾아가는 저작권 교육

‘찾아가는 저작권 교육’은 저작권 교육이 필요한 공공기관, 대학, 문화예술단체 등을 대상으로 무료로 강의를 지원하는 맞춤형 교육 서비스입니다. -

담당자 연락처) 02-2669-0083

+

담당자 연락처) 055-792-0233

 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp index 3b5714ee..544526b9 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctReg.jsp @@ -553,7 +553,7 @@

찾아가는 저작권 교육

‘찾아가는 저작권 교육’은 저작권 교육이 필요한 공공기관, 대학, 문화예술단체 등을 대상으로 무료로 강의를 지원하는 맞춤형 교육 서비스입니다. -

담당자 연락처) 02-2669-0083

+

담당자 연락처) 055-792-0233

 diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp index a7e67ee4..872a8303 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp @@ -1093,7 +1093,7 @@

찾아가는 저작권 교육

‘찾아가는 저작권 교육’은 저작권 교육이 필요한 공공기관, 대학, 문화예술단체 등을 대상으로 무료로 강의를 지원하는 맞춤형 교육 서비스입니다. -

담당자 연락처) 02-2669-0083

+

담당자 연락처) 055-792-0233