From a816b4c24e4604da7ab146257823643f56b0dfd0 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Thu, 25 Jan 2024 17:08:58 +0900
Subject: [PATCH] =?UTF-8?q?2024-01-25=2017:08=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=EC=9E=90=20=ED=99=94=EB=A9=B4=20UI=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ve/aplct/comweb/CommonWebController.java  |  2 +-
 .../oprtn/adultVisitEdu/eduCnfrmMngList.jsp   | 33 ++++++++++---------
 .../popup/instrAsgnmDstncPopup.jsp            |  4 ++-
 3 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java
index 3f15635f..fa63f472 100644
--- a/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java
+++ b/src/main/java/kcc/ve/aplct/comweb/CommonWebController.java
@@ -1379,7 +1379,7 @@ public class CommonWebController {
     		
     		
         	//step3-4.월별시수대비할당이적은자 우선(필)
-    		String s_orderByQuery	=	"	aaa.instrSumChasi*10000/(aaa.asgnmTm+1) asc	";
+    		String s_orderByQuery	=	"	NVL(aaa.instrSumChasi*10000,0)/(aaa.asgnmTm+1) asc	";
     		s_user_id	=	"'aaa'";
     		for (int j=0;j<vEInstrAssiEduAplctVOList.size();j++) {
     			s_user_id	=	s_user_id	+	",'"	+	vEInstrAssiEduAplctVOList.get(j).getUserId()+"'";
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp
index 2e15e0c3..27614753 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/adultVisitEdu/eduCnfrmMngList.jsp
@@ -677,46 +677,47 @@
 								</td>
 								<td>
 									<fmt:parseDate value="${list.eduHopeDt}" var="eduHopeDt" pattern="yyyy.MM.dd"/>
-									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
+									<!-- 교육배치관리는 링크가 없어서 우선 링크 제거함 -->
+									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
 										<fmt:formatDate value="${eduHopeDt}" pattern="yyyy.MM.dd"/>
-									</a>
+									
 								</td>
 								<td>
-									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
+									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
 										<fmt:formatDate value="${eduHopeDt}" pattern="E"/>
-									</a>
+									
 								</td>
 								<td>
-									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
+									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
 										<fmt:parseDate value="${list.strtTm}" var="strtTm" pattern="kkmm"/><fmt:formatDate value="${strtTm}" pattern="kk:mm"/>
 										~<fmt:parseDate value="${list.endTm}" var="endTm" pattern="kkmm"/><fmt:formatDate value="${endTm}" pattern="kk:mm"/>
 										(<c:out value="${list.lrnTm}" />분)
-									</a>
+									
 								</td>
 								<td>
-									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
+									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
 										<ve:code codeId="VE0007" code="${list.eduSlctCd}"/>
-									</a>
+									
 								</td>
 								<td>
-									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
+									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
 										<ve:code codeId="VE0008" code="${list.eduSlctAreaCd}"/>
-									</a>
+									
 								</td>
 								<td id="listScholInsttNm">
-									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
+									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
 										<c:out value="${list.insttNm}"/>
-									</a>
+									
 								</td>
 								<td>
-									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
+									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
 										<c:out value="${list.eduTrgt}"/>
-									</a>
+									
 								</td>
 								<td>
-									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;">
+									<a href="#" onclick="javascript:fncGoDetail('${list.eduAplctOrd}'); return false;"></a>
 										<c:out value="${list.instrNm}"/>
-									</a>
+									
 								</td>
 								<td>
 									<ve:code codeId="VE0019" code="${list.asgnmAprvlCd}"/>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmDstncPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmDstncPopup.jsp
index 1bb7c678..318ef3e5 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmDstncPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/tngrVisitEdu/popup/instrAsgnmDstncPopup.jsp
@@ -261,9 +261,11 @@
 									</c:when>
 									<c:otherwise>
 										계산완료
+										<!-- 
 										<input name="chk" class="${list.asgnmAprvlCd}" 
 											value="${list.eduAplctOrd}@${list.eduChasiOrd}" 
-											title="Check" type="checkbox"/>																																		
+											title="Check" type="checkbox"/>
+											 -->																																		
 									</c:otherwise>
 								</c:choose>