From 325f16bafb29b63e7f3d39ae16d200330a7fe39f Mon Sep 17 00:00:00 2001
From: hylee <hehihoho3@gmail.com>
Date: Fri, 30 Jun 2023 17:44:49 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20pms-#3221=20"[=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EC=9E=90]=20=EC=B2=AD=EC=86=8C=EB=85=84=EC=B0=BE=EC=95=84?=
 =?UTF-8?q?=EA=B0=80=EB=8A=94=20=EC=A0=80=EC=9E=91=EA=B6=8C=20=EA=B5=90?=
 =?UTF-8?q?=EC=9C=A1=20>=20=EA=B0=95=EC=9D=98=EC=A1=B0=EC=82=AC=20?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD=20=EB=AA=A9=EB=A1=9D=20>=20=EA=B0=95?=
 =?UTF-8?q?=EC=9D=98=EC=A1=B0=EC=82=AC=20=EC=A7=84=ED=96=89=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D(=EC=83=81=EC=84=B8)=20=EC=88=98=EC=A0=95=20=EC=82=AC?=
 =?UTF-8?q?=ED=95=AD"=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../web/OprtnLctrRsrchTngrContoller.java      | 22 +++++++-
 .../ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml      |  1 -
 .../ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml     |  3 +
 .../oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp | 55 ++++++++++++++++---
 .../oprtn/tngrVisitEdu/lctrRsrchMngList.jsp   | 16 +++---
 5 files changed, 78 insertions(+), 19 deletions(-)

diff --git a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java
index af11215a..77916b64 100644
--- a/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java
+++ b/src/main/java/kcc/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/web/OprtnLctrRsrchTngrContoller.java
@@ -342,8 +342,6 @@ public class OprtnLctrRsrchTngrContoller {
 	        
 			//로그인 처리====================================  
 	        
-			System.out.println(vELctrDetailVO.getStngYrMnt());
-			System.out.println(vELctrDetailVO.getRsrchInstrDiv());
 	    	
 			//1.pageing step1				
 			PaginationInfo paginationInfo = new PaginationInfo();
@@ -352,8 +350,28 @@ public class OprtnLctrRsrchTngrContoller {
 			
 			//2. pageing step2
 			vELctrDetailVO = vEPagingUtil.setPagingStep2_VELctrDetailVO(vELctrDetailVO, paginationInfo);
+			
+			System.out.println("vELctrDetailVO.getOrderByQuery() :: "+ vELctrDetailVO.getOrderByQuery());
+			
+			// 공통으로 사용하는 setPagingStep2_VELctrDetailVO 메소드에서
+			// vELctrDetailVO.getSearchSortCnd() 이 없으면 prcs_ord로 강제 입력하는데
+			// prcs_ord값은 detail 쿼리에 없는 값이라 다시 초기화 함
+			System.out.println(vELctrDetailVO.getSearchSortCnd());
+			System.out.println(vELctrDetailVO.getSearchSortOrd());
+			if("prcs_ord".equals(vELctrDetailVO.getSearchSortCnd())) {
+				vELctrDetailVO.setSearchSortCnd("");
+				vELctrDetailVO.setSearchSortOrd("");
+			}
+			
+			
+			
+			if(StringUtils.isNotEmpty(vELctrDetailVO.getSearchSortCnd())) {
+				vELctrDetailVO.setOrderByQuery(vELctrDetailVO.getSearchSortCnd()+" "+vELctrDetailVO.getSearchSortOrd());
+			}
+			
 			List<VELctrDetailVO> selectVELctrDetailVOList = vELctrRsrchMngService.selectPagingListLctr(vELctrDetailVO);
 			
+			System.out.println("============");
 			
 			//3.pageing step3
 			paginationInfo = vEPagingUtil.setPagingStep3_VELctrDetailVO(selectVELctrDetailVOList, paginationInfo);
diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml
index 76bee03b..273ca3bb 100644
--- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAcmdtAplct_SQL_Cubrid.xml
@@ -159,7 +159,6 @@
 			</isNotEmpty>
 	</select>
 	
-	<!-- 강사 정보 R -->
 	<select id="VEAcmdtAplctDAO.selectDetailByUser_r2" parameterClass="VEInstrFeeAcmdtVO" resultClass="VEInstrFeeAcmdtVO">
 			select
 				  vaa.aprvl_cd  as aprvlCd 
diff --git a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml
index 6cb1883f..3d888bed 100644
--- a/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/lctr/VELctrRsrchMng_SQL_Cubrid.xml
@@ -345,7 +345,10 @@
 	
 				
 		ORDER BY 1=1					
+<!-- 		<isNotNull prepend=" ," property="searchSortCnd"> -->
 			
+<!-- 		</isNotNull> -->
+		
 		<isEmpty property="orderByQuery">
 			, dddd.rsdne asc
 		</isEmpty>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp
index 2b3c9fa8..198c16e2 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngDetail.jsp
@@ -30,6 +30,40 @@
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
 	<script type="text/javascript">
+	
+		$(document).ready(function(){
+			var $cnd = $('#searchSortCnd');
+			var $ord = $('#searchSortOrd');
+			$('.sort_btn').click(function(){
+				
+				$cnd.val($(this).attr('id').replace('_sort', ''));
+				
+				if($(this).text() == '▼'){
+					$ord.val('asc');
+					$(this).text('▲');
+				}else{
+					$ord.val('desc');
+					$(this).text('▼');
+				}
+				linkPage(1);
+				
+			});
+			
+			sort_init();
+		});
+		
+		function sort_init(){
+			var $cnd = $('#searchSortCnd');
+			var $ord = $('#searchSortOrd');
+
+			
+			if($ord.val() == 'asc'){
+				var idVal ='#'+$cnd.val()+'_sort'; 
+				console.log(idVal);
+				$(idVal).text('▲');
+			}
+			
+		}
 		function fncGoList(){
 			var listForm = document.listForm ;			
 			listForm.stngYrMnt.value = '' ;
@@ -96,8 +130,8 @@
 <body>
 <form:form id="listForm" name="listForm" method="post" commandName="vEInstrDetailVO" onsubmit="return false;">
 	<input type="hidden" name="pageIndex" value="<c:out value='${vELctrDetailVO.pageIndex}' default='1' />"/>
-	<input type="hidden" name="searchSortCnd" value="<c:out value="${vELctrDetailVO.searchSortCnd}" />" />
-	<input type="hidden" name="searchSortOrd" value="<c:out value="${vELctrDetailVO.searchSortOrd}" />" />
+	<input type="hidden" name="searchSortCnd" id="searchSortCnd" value="<c:out value="${vELctrDetailVO.searchSortCnd}" />" />
+	<input type="hidden" name="searchSortOrd" id="searchSortOrd" value="<c:out value="${vELctrDetailVO.searchSortOrd}" />" />
 
 
 	<input type="hidden" name="userId" id="userId" value=""/>	<!-- 사용자 아이디 -->
@@ -190,21 +224,24 @@
 						</colgroup>
 						<thead>
 						<tr>
+<!-- 							<th>이름<button class="sort_btn" id="instrNm_sort">▼</button></th> -->
 							<th>이름</th>
-							<th>구분</th>
-							<th>거주지역</th>
-							<th>강의가능지역</th>
+							<th>구분<button class="sort_btn" id="divCd_sort">▼</button></th>
+							<th>거주지역<button class="sort_btn" id="rsdne_sort">▼</button></th>
+							<th>강의가능지역<button class="sort_btn" id="lctrAreaNm_sort">▼</button></th>
+<!-- 							<th>연락처<button class="sort_btn" id="phone_sort">▼</button></th> -->
 							<th>연락처</th>
-							<th>주5일여부</th>
-							<th>자격종료여부</th>
-							<th>강의조사서제출여부</th>														
+							<th>주5일여부<button class="sort_btn" id="wCnt_sort">▼</button></th>
+							<th>자격종료여부<button class="sort_btn" id="qlfctEndYn_sort">▼</button></th>
+							<th>제출여부<button class="sort_btn" id="lctrStngOrd_sort">▼</button></th>
+<!-- 							<th>강의조사서제출여부<button class="sort_btn">▼</button></th>														 -->
 						</tr>
 						</thead>
 						<tbody>
 						<c:forEach var="list" items="${list}" varStatus="status">
 							<tr>
 								<td>
-									<c:out value="${list.instrNm}"/>																		
+									<c:out value="${list.instrNm}"/>
 									<br/>(${fn:split(list.userId,'_')[1]*1})
 								</td>
 								<td>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngList.jsp
index ea82ece9..e1f2e433 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/lctrRsrchMngList.jsp
@@ -37,11 +37,13 @@
 		function linkPage(pageNo){
 			var listForm = document.listForm ;
 			listForm.pageIndex.value = pageNo ;
-			if(listForm.searchStartDt.value > listForm.searchEndDt.value){
-				alert("시작일은 종료일보다 작아야합니다.");
-				return;
-			}
-			listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/instrInfo/lctrRsrchMngList.do'/>";
+// 			console.log('listForm : ', listForm);
+// 			if(listForm.searchStartDt.value > listForm.searchEndDt.value){
+// 				alert("시작일은 종료일보다 작아야합니다.");
+// 				return;
+// 			}
+// 			listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/instrInfo/lctrRsrchMngList.do'/>";
+			listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/lctrRsrchMngList.do'/>";
 			listForm.submit();
 		}
 
@@ -56,14 +58,14 @@
 		function fncGoReg(){
 			var listForm = document.listForm ;
 			listForm.instrDiv.value = "10" ;
-			listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrAplctReg.do'/>";
+			listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/instrAplctReg.do'/>";
 			listForm.submit();
 		}
 		
 		function fncGoRegExcel(){
 			var listForm = document.listForm ;
 			listForm.instrDiv.value = "10" ;
-			listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/instrInfo/instrAplctRegExcel.do'/>";
+			listForm.action = "<c:url value='/ve/oprtn/instr/tngrVisitEdu/lctrRsrch/instrAplctRegExcel.do'/>";
 			listForm.submit();
 		}