diff --git a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java index b7f67e46..76fe8224 100644 --- a/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java +++ b/src/main/java/kcc/ve/oprtn/cpyrgExprnClsrm/oprtnAplctMng/web/OprtnAplctMngController.java @@ -447,7 +447,7 @@ public class OprtnAplctMngController { // 세팅값 String title = "저작권 체험교실 운영 신청 접수 목록"; int[] width = {1500, 2000, 2000, 4000, 4000, 4000, 4000, 4000, 2000, 10000 - , 3000, 3000, 4000, 4000, 4000, 4000, 4000, 4000, 4000, 6000 + , 3000, 3000, 4000, 4000, 4000, 4000, 4000, 4000, 8000 , 4000, 3000, 4000 }; // 너비 @@ -469,8 +469,7 @@ String[] header = { ,"운영연도" ,"신청경로" -,"대상학년" -,"대상반" +,"대상학년/반" ,"학생수" ,"보고서제출일" @@ -500,7 +499,6 @@ String[] order = { ,"ExprnClsrnAplct" ,"TrgtGrade" -,"TrgtClsrm" ,"TrgtPrsnl" ,"RprtSbmtDt" @@ -543,8 +541,8 @@ String[] order = { List atchFileIdList = new ArrayList(); vEEduAplctVOList.forEach( vo -> { - if(vo.getOathAtchFileId() != null) { - atchFileIdList.add(vo.getOathAtchFileId()); + if(vo.getScholSealAtchFileId() != null) { + atchFileIdList.add(vo.getScholSealAtchFileId()); } }); @@ -577,14 +575,14 @@ String[] order = { //첨부파일있는 항목만 재배치 List atchFileIdList = new ArrayList(); vEEduAplctVOList.forEach( vo -> { - if(vo.getOathAtchFileId() != null) { - atchFileIdList.add(vo.getOathAtchFileId()); + if(vo.getScholSealAtchFileId() != null) { + atchFileIdList.add(vo.getScholSealAtchFileId()); } }); List fileYEduList = new ArrayList(); vEEduAplctVOList.forEach( vo -> { - if(vo.getOathAtchFileId() != null) { + if(vo.getScholSealAtchFileId() != null) { fileYEduList.add(vo); } }); 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 1d29ea0d..3c6aad86 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 @@ -5953,7 +5953,8 @@ , TO_CHAR(E.RPRT_SBMT,'YYYY-MM-DD') AS rprtSbmtDt - , TO_CHAR(TO_DATE(E.OPRTN_STRT_DT,'YYYYMMdd') ,'YYYY-MM-dd') || '~' || TO_CHAR(TO_DATE(E.OPRTN_END_DT,'YYYYMMdd') ,'YYYY-MM-dd') + + , TO_CHAR(TO_DATE(E.OPRTN_STRT_DT,'YYYY.MM.dd') ,'YYYY-MM-dd') || '~' || TO_CHAR(TO_DATE(E.OPRTN_END_DT,'YYYY.MM.dd') ,'YYYY-MM-dd') AS oprtnStrtDt , A.MDFY_RQST_YN AS mdfyRqstYn , DECODE(E.chrg_sex_cd, 'M', '남성', 'F', '여성') AS chrgSexCd @@ -8751,7 +8752,8 @@ VALUES A.edu_aplct_ord AS eduAplctOrd, A.schol_instt_nm AS scholInsttNm, A.chrg_nm AS chrgNm, - A.oath_atch_file_id AS oathAtchFileId + A.oath_atch_file_id AS oathAtchFileId, + A.SCHOL_SEAL_ATCH_FILE_ID AS scholSealAtchFileId FROM VE_EDU_APLCT A WHERE A.edu_aplct_ord IN diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp index 95082c67..b6f3a968 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp @@ -50,7 +50,7 @@ try{ sendSms( "", - "교육운영 관리 시스템입니다. 등록하신 체험교실 운영신청 수정요청드립니다.", + "교육운영 관리 시스템입니다. 등록하신 체험교실 운영신청 수정요청드립니다.\n(수정요청사유: "+$("#aprvlCn").val()+")", "", "", "G", 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 ceb9006e..d7ded5b8 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp @@ -183,13 +183,13 @@ -

처리상태

+

처리상태

- +

수정요청사유

@@ -521,7 +521,7 @@
- +