From 6db8042ba3a02cf183169dd5dcf53fb1052a4a8d Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Wed, 5 Nov 2025 18:21:27 +0900
Subject: [PATCH] =?UTF-8?q?2025-11-05=20118:21=20=EA=B0=95=EC=82=AC=20?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../instrInfo/service/VEInstrDetailVO.java    |  8 ++++++
 .../ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml | 26 ++++++++++++++++++-
 .../cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp |  1 +
 .../popup/cndtnInstrAsgnmPopup.jsp            | 25 +++++++++++++-----
 .../prevent/cndtnEduPrcsAplctCfnMngDetail.jsp |  1 +
 5 files changed, 53 insertions(+), 8 deletions(-)

diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java
index 85888bb6..cc333184 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/instrInfo/service/VEInstrDetailVO.java
@@ -229,6 +229,8 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable {
 	//지적재산권 컬럼 추가
 	private String carer;		//경력
 	
+	private String yearCnt;		//1년간배정횟수
+	
 	private String repQf;		//대표자격
 	public String getRepQf() {
 		return repQf;
@@ -1270,5 +1272,11 @@ public class VEInstrDetailVO extends ComDefaultVO implements Serializable {
 	public void setCarer(String carer) {
 		this.carer = carer;
 	}
+	public String getYearCnt() {
+		return yearCnt;
+	}
+	public void setYearCnt(String yearCnt) {
+		this.yearCnt = yearCnt;
+	}
 	
 }
diff --git a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml
index 8661d8d7..e8c1684a 100644
--- a/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/prcs/VEPrcsAplctPrd_SQL_Postgresql.xml
@@ -943,12 +943,36 @@
        		, a.ovrl_srvy		AS ovrlSrvy	
        		
        		, a.carer			AS carer
+       		
+			, COALESCE(c.cnt,0) as cnt
+			, COALESCE(c.yearcnt,0) as yearcnt       		
+       		
 		FROM 			
 			ve_instr b
-			, ve_instr_detail a
+			, ve_instr_detail a			
+			LEFT OUTER JOIN (			
+					select user_id, count(*) as cnt, sum(edu) as yearcnt
+					from (
+					
+							select a.user_id
+								, CASE 
+							    WHEN 365 > (now()::date - b.edu_strt_pnttm::date)	THEN 1
+							    ELSE 0
+							END AS edu
+								
+							from vea_prcs_aplct_prd_instr_asgnm a
+								, ve_prcs_aplct_prd b
+							where a.prcs_aplct_prd_ord =b.prcs_aplct_prd_ord
+					
+						)aa
+					group by user_id
+			)c		
+			ON(1=1	AND a.user_id = c.user_id)	
+			
 		WHERE
 			1=1		
 			AND a.user_id=b.user_id
+			
 		<isNotEmpty property="selectPagingListQuery">
 			$selectPagingListQuery$
 		</isNotEmpty>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp
index 6d040e46..4c3e6174 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cmdTrgt/cndtnEduPrcsAplctCfnMngDetail.jsp
@@ -211,6 +211,7 @@
 		
 // 		form.action = "<c:url value='/kccadr/oprtn/cmdTrgt/popup/fndthInstrAsgnmPopup.do'/>";
 		form.action = "<c:url value='/kccadr/oprtn/cmdTrgt/popup/cndtnInstrAsgnmPopup.do'/>";
+		form.action = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/popup/cndtnInstrAsgnmPopup.do'/>";
 		
 		window.open("#", "_securityPop", "scrollbars = no, top=100px, left=100px, height=750px, width=950px");    
 		form.target = "_securityPop";
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnInstrAsgnmPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnInstrAsgnmPopup.jsp
index a10d1b26..885d3b98 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnInstrAsgnmPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cndtnInstrAsgnmPopup.jsp
@@ -111,8 +111,9 @@
 			<input type="hidden" name="asgnmAprvlCd" id="asgnmAprvlCd" value="30"/> <!-- VE0019 배정 승인 코드 30 확정 -->
 			<input type="hidden" name="prcsAplctPrdOrd" id="prcsAplctPrdOrd" value="<c:out value="${vEPrcsDetailVO.prcsAplctPrdOrd}" />" />	
 			
-			<input type="hidden" name="searchSortCnd" value="<c:out value="${vEEduAplctVO.searchSortCnd}" />" />
-			<input type="hidden" name="searchSortOrd" value="<c:out value="${vEEduAplctVO.searchSortOrd}" />" />	
+			<input type="hidden" name="searchSortCnd" value="<c:out value="${vEPrcsDetailVO.searchSortCnd}" />" />
+			<input type="hidden" name="searchSortOrd" value="<c:out value="${vEPrcsDetailVO.searchSortOrd}" />" />	
+			<input type="hidden" name="orderByQuery" id="orderByQuery" value="<c:out value="${vEPrcsDetailVO.orderByQuery}" />" />
 		
 			<input type="hidden" name="pageIndex" value="<c:out value='${vEEduAplctVO.pageIndex}' default='1' />"/>
 			<input type="hidden" name="pageUnit" value="5" />
@@ -151,18 +152,26 @@
 								<col style="width: 15%;">
 								<col style="width: 15%;">
 								<%-- <col style="width: 9%;"> --%>
+								<col style="width: 11%;">
+								<col style="width: 9%;">
 								<col style="width: 9%;">
 							</colgroup>
 							<thead>
 								<tr>
 									<th scope="col">no</th>
-									<th scope="col">성명<button class="sort sortBtn" id="sort_BBS_NM">▲</button></th>
-									<th scope="col">소속명<button class="sort sortBtn" id="sort_BBS_NM">▲</button></th>
+									<th scope="col">성명</th>
+									<th scope="col">소속명<button class="sort sortBtn" id="sort_work_area">▲</button></th>
 		<!-- 							<th scope="col">이동<br>거리</th> -->
-									<th scope="col">근무지역<button class="sort sortBtn" id="sort_BBS_NM">▲</button></th>
-									<th scope="col">강의가능지역<button class="sort sortBtn" id="sort_BBS_NM">▲</button></th>
-									<th scope="col">강의가능내용<button class="sort sortBtn" id="sort_BBS_NM">▲</button></th>
+									<th scope="col">근무지역<button class="sort sortBtn" id="sort_rsdne">▲</button></th>
+									<!-- 
+									<th scope="col">강의가능지역<button class="sort sortBtn" id="sort_LCT_AVL_AREA_1">▲</button></th>
+									<th scope="col">강의가능내용<button class="sort sortBtn" id="sort_AVL_LCT_CNTNT_1">▲</button></th>
+									 -->
+									<th scope="col">강의가능지역</th>
+									<th scope="col">강의가능내용</th>									
 									<!-- <th scope="col">Penalty 횟수</th> -->
+									<th scope="col">배정횟수(1년간)<button class="sort sortBtn" id="sort_yearcnt">▲</button></th>
+									<th scope="col">배정횟수(전체)<button class="sort sortBtn" id="sort_cnt">▲</button></th>
 									<th scope="col">선택</th>
 								</tr>
 							</thead>
@@ -191,6 +200,8 @@
 										<c:if test="${list.avlLctCntnt3 eq 'Y'}">부정경쟁행위 교육<br/></c:if>
 										
 									</td>
+									<td><c:out value='${list.yearCnt}'/></td>
+									<td><c:out value='${list.cnt}'/></td>
 									<td>
 										<c:if test='${empty list.chrgNm}'>
 											<button class="btn_type06" 
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp
index e13dfd1d..1ac9871b 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/prevent/cndtnEduPrcsAplctCfnMngDetail.jsp
@@ -211,6 +211,7 @@
 		
 // 		form.action = "<c:url value='/kccadr/oprtn/prevent/popup/fndthInstrAsgnmPopup.do'/>";
 		form.action = "<c:url value='/kccadr/oprtn/prevent/popup/cndtnInstrAsgnmPopup.do'/>";
+		form.action = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/popup/cndtnInstrAsgnmPopup.do'/>";
 		
 		window.open("#", "_securityPop", "scrollbars = no, top=100px, left=100px, height=750px, width=950px");    
 		form.target = "_securityPop";