From a9f970be2196788012a4e4b82e139d76d3232774 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Thu, 21 Mar 2024 10:00:25 +0900
Subject: [PATCH] =?UTF-8?q?2024-03-21=2009:58=20=EC=B2=B4=ED=97=98?=
 =?UTF-8?q?=EA=B5=90=EC=8B=A4=20=EC=A0=95=EB=A0=AC=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?=EB=B0=8F=20=EC=B2=98=EB=A6=AC=EC=83=81=ED=83=9C=EA=B0=92=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../oprtnAplctMng/web/OprtnAplctMngController.java   | 12 ++++++++++++
 .../jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngList.jsp  |  7 +++++--
 2 files changed, 17 insertions(+), 2 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 7c7a215d..b1a55feb 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
@@ -154,6 +154,18 @@ public class OprtnAplctMngController {
 			vEEduAplctVO.setSearchKeyword(egovCryptoUtil.encrypt(vEEduAplctVO.getSearchKeyword()));
 		}		
 		model.addAttribute("cryptoUtil", egovCryptoUtil);
+		
+		
+    	//정렬
+		if("".equals(vEEduAplctVO.getSearchSortCnd())){ //최초조회시 최신것 조회List
+			vEEduAplctVO.setOrderByQuery("A.SBMT_PNTTM DESC");
+		}else{
+			vEEduAplctVO.setOrderByQuery(vEEduAplctVO.getSearchSortCnd() + " " +vEEduAplctVO.getSearchSortOrd());
+		}
+		
+		System.out.println("vEEduAplctVO.getOrderByQuery() :: "+ vEEduAplctVO.getOrderByQuery());
+		
+		
     	//1.pageing step1
     	PaginationInfo paginationInfo = this.setPagingStep1(vEEduAplctVO);
     	
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngList.jsp
index 5aecca8b..778d20bb 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngList.jsp
@@ -303,6 +303,8 @@ input:read-only {
 										<c:if test="${vEEduAplctVO.searchCpyAprvlCd eq '12'}">selected</c:if>>운영 미확정</option>
 									<option value="13"
 										<c:if test="${vEEduAplctVO.searchCpyAprvlCd eq '13'}">selected</c:if>>수정완료</option>
+									<option value="14"
+										<c:if test="${vEEduAplctVO.searchCpyAprvlCd eq '14'}">selected</c:if>>운영취소</option>
 									<option value="20"
 										<c:if test="${vEEduAplctVO.searchCpyAprvlCd eq '20'}">selected</c:if>>운영 확정</option>
 									<%-- <option value="30"
@@ -377,9 +379,9 @@ input:read-only {
 									<th><input type="checkbox" name="checkAll" id="checkAll" onclick="fnCheckAll();" /><label for="checkAll"></label></th>
 									<th>번호</th>
 									<th>담당교과</th>
-									<th>학교명</th>
+									<th>학교명<button class="sort sortBtn" id="sort_scholInsttNm">▲</button></th>									
 									<th>담당자</th>
-									<th>신청일자</th>
+									<th>신청일자<button class="sort sortBtn" id="sort_sbmtPnttm">▲</button></th>									
 									<!-- <th>선정여부</th> -->
 									<th>처리상태</th>
 									<th>비고</th>
@@ -456,6 +458,7 @@ input:read-only {
 								<option value="11">수정요청</option>
 								<option value="20">운영교사 선정</option>
 								<option value="12">운영교사 미선정</option>
+								<option value="14">운영취소</option>								
 								<option value="40">서류제출 요청</option>
 								<option value="50">결과보고 요청</option>
 								<option value="80">운영종료</option>