From 8c1ac1c769c1a02593778bee39df9450d4788102 Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Tue, 20 Feb 2024 11:45:09 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=B2=B4=ED=97=98=EA=B5=90=EC=8B=A4=20?=
 =?UTF-8?q?=EC=8B=A0=EC=B2=AD=EC=84=9C,=20=EC=97=91=EC=85=80=EB=8B=A4?=
 =?UTF-8?q?=EC=9A=B4=EB=A1=9C=EB=93=9C=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95=EC=9A=94=EC=B2=AD=20=EC=82=AC=EC=9C=A0=20?=
 =?UTF-8?q?=EB=AC=B8=EC=9E=90=EB=B0=9C=EC=86=A1=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/OprtnAplctMngController.java             | 16 +++++++---------
 .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml       |  6 ++++--
 .../webapp/WEB-INF/jsp/oprtn/cmm/rejectPopup.jsp |  2 +-
 .../cpyrgExprnClsrm/oprtnAplctMngDetail.jsp      |  6 +++---
 4 files changed, 15 insertions(+), 15 deletions(-)

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<String> atchFileIdList = new ArrayList<String>();
 		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<String> atchFileIdList = new ArrayList<String>();
 		vEEduAplctVOList.forEach( vo -> {
-			if(vo.getOathAtchFileId() != null) {
-				atchFileIdList.add(vo.getOathAtchFileId());
+			if(vo.getScholSealAtchFileId() != null) {
+				atchFileIdList.add(vo.getScholSealAtchFileId());
 			}
 		});
 		
 		List<VEEduAplctVO> fileYEduList = new ArrayList<VEEduAplctVO>();
 		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
 			<!-- , DATE_FORMAT(STR_TO_DATE(E.OPRTN_STRT_DT,'%Y%m%d') ,'%Y-%m-%d') || '~' || DATE_FORMAT(STR_TO_DATE(E.OPRTN_END_DT,'%Y%m%d') ,'%Y-%m-%d') -->
-			, 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,'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
 		<iterate property="eduAplctOrdList" open="(" close=")" conjunction=",">
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(
 										"<c:out value='${veEduAplctVO.phone}'/>",
-										"교육운영 관리 시스템입니다. 등록하신 체험교실 운영신청 수정요청드립니다.", 
+										"교육운영 관리 시스템입니다. 등록하신 체험교실 운영신청 수정요청드립니다.\n(수정요청사유: "+$("#aprvlCn").val()+")", 
 										"<c:out value="${veEduAplctVO.eduAplctOrd}" />",
 										"<c:out value='${veEduAplctVO.targetId}'/>",
 										"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 @@
 						</tr>
 						<tr>
 							<th scope="row">
-								<p>처리상태 </p>
+								<p>처리상태</p>
 							</th>
 							<td colspan="3">
 								<ve:code codeId="VEA013" code="${info.aprvlCd}"/>
 							</td>
 						</tr>
-						<c:if test="${info.aprvlCd eq '70'}">
+						<c:if test="${info.aprvlCd eq '11'}">
 						<tr>
 							<th scope="row">
 								<p>수정요청사유</p>
@@ -521,7 +521,7 @@
 			<div class="btn_wrap btn_layout01">
 				<div class="btn_left">
 				<!-- 운영신청 상태, 수정완료상태에서만 수정요청 가능 -->
-				<c:if test="${info.aprvlCd eq '10' or info.aprvlCd eq '13'}">
+				<c:if test="${info.aprvlCd eq '10' or info.aprvlCd eq '11' or info.aprvlCd eq '13'}">
 					<button type="button" class="btn_type01" onclick="fncRejectPopup(); return false;">수정요청</button>
 				</c:if>
 				</div>