From 28ab2104b4b1ac0bcc3be282b261d3bdb3ce77c0 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Mon, 8 Apr 2024 11:37:16 +0900
Subject: [PATCH] =?UTF-8?q?2024-04-08=2011:37=20=EA=B8=B0=EC=86=8C?=
 =?UTF-8?q?=EC=9C=A0=EC=98=88=20=EC=9D=B4=EB=A0=A5=20=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=EB=85=B8=EC=B6=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trgtMng/web/CndtnTrgtMngController.java   | 23 ++++++-
 .../web/CndtnPrcsInfoMngController.java       |  2 +-
 .../oprtn/cndtnSspnIdtmt/trgtCmpltDetail.jsp  | 65 +++++++++++++++++++
 .../jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp   | 65 +++++++++++++++++++
 .../oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp    | 64 ++++++++++++++++++
 5 files changed, 215 insertions(+), 4 deletions(-)

diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
index 4132d8af..c90cb1c2 100644
--- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/web/CndtnTrgtMngController.java
@@ -1413,6 +1413,11 @@ public class CndtnTrgtMngController {
 		model.addAttribute("listTopMerge", cndtnTrgtInfoTopMngVOList);
 		
 		
+		//이력정보
+		List<CndtnTrgtMngVO> cndtnTrgtMngVOList = cndtnTrgtInfoMngService.selectListRelated(cndtnTrgtInfoMngVO);		
+		model.addAttribute("cndtnTrgtMngVOList", cndtnTrgtMngVOList);
+		
+		
 		return "oprtn/cndtnSspnIdtmt/trgtDetail";
 	}
 
@@ -1475,6 +1480,12 @@ public class CndtnTrgtMngController {
 		cndtnTrgtInfoMngVOList	=	egovCryptoUtil.decryptCndtnTrgtMngVOList(cndtnTrgtInfoTopMngVOList);				
 		model.addAttribute("listTopMerge", cndtnTrgtInfoTopMngVOList);
 		
+		
+		//이력정보
+		List<CndtnTrgtMngVO> cndtnTrgtMngVOList = cndtnTrgtInfoMngService.selectListRelated(cndtnTrgtInfoMngVO);		
+		model.addAttribute("cndtnTrgtMngVOList", cndtnTrgtMngVOList);
+		
+		
 		return "oprtn/cndtnSspnIdtmt/trgtMngDetail";
 	}	
 	
@@ -1560,6 +1571,12 @@ public class CndtnTrgtMngController {
     	
 		model.addAttribute("listMerge", cndtnTrgtInfoMergeVOList);
 		
+		
+		//이력정보
+		List<CndtnTrgtMngVO> cndtnTrgtMngVOList = cndtnTrgtInfoMngService.selectListRelated(cndtnTrgtInfoMngVO);		
+		model.addAttribute("cndtnTrgtMngVOList", cndtnTrgtMngVOList);
+		
+		
 		return "oprtn/cndtnSspnIdtmt/trgtCmpltDetail";
 	}
 
@@ -2306,18 +2323,18 @@ public class CndtnTrgtMngController {
 
 		
         int[] width = {
-        		4000, 5000, 5000, 5000, 3000
+        		4000, 5000, 5000, 5000, 3000, 5000
         		, 3000, 5000, 4000, 5000, 13000
         		
         		, 3500, 13000
         		}; // 너비
         String[] header = {
-        		"의뢰일", "사건번호", "관할청", "생년월일", "성명"
+        		"의뢰일", "사건번호", "관할청", "생년월일", "성명", "연락처"
         		, "성별" , "의뢰번호", "의뢰상태", "교육상태", "주소"
         		, "검사명", "비공개메모" 
         		}; // 헤더에 들어갈 이름
         String[] order = {
-        		"ReqPnttm", "VntYear", "CmptntAthrt", "DBirth", "TrgtNm"
+        		"ReqPnttm", "VntYear", "CmptntAthrt", "DBirth", "TrgtNm", "Clphone"
         		, "Sex", "ReqNmbr", "ReqStateCd", "EduStateCd", "Addr"
         		
         		, "PrsctrNm", "Rmrks"
diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
index 086b62bc..e12f0f6d 100644
--- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
@@ -2132,11 +2132,11 @@ public class CndtnPrcsInfoMngController {
 		model.addAttribute("info", cndtnTrgtInfoVO);
 		
 		
+		//이력정보
 		List<CndtnTrgtMngVO> cndtnTrgtMngVOList = cndtnTrgtInfoMngService.selectListRelated(cndtnTrgtInfoMngVO);		
 		model.addAttribute("cndtnTrgtMngVOList", cndtnTrgtMngVOList);
 		
 		
-		
 		return "/oprtn/cndtnSspnIdtmt/popup/detailPopup";
 	}
 
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltDetail.jsp
index e475bff1..9e64d889 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtCmpltDetail.jsp
@@ -567,6 +567,71 @@
 			</div>						
 						
 		</c:if>
+		
+		
+			<div class="tb_tit01">
+				<p>교육이력정보</p>
+			</div>
+			
+			<div class="tb_type01">
+				<table>
+					<colgroup>
+						<col style="width: 10%">
+						<col style="width: auto;">
+						<col style="width: 180px;">						
+						<col style="width: 180px;">
+						<col style="width: 180px;">
+					</colgroup>
+					<thead>
+					<tr>						
+						<th>번호</th>
+						<th>교육명</th>
+						<th>교육일</th>
+						<th>확정여부</th>
+						<th>교육상태</th>												
+					</tr>
+					</thead>					
+					<tbody>
+						<c:choose>
+							<c:when test="${!empty cndtnTrgtMngVOList}">
+								<c:forEach var="list" items="${cndtnTrgtMngVOList}" varStatus="status">
+									<tr>
+										<td>
+											<c:out value="${status.count}"/>
+										</td>
+										<td>
+											<c:out value="${list.title}"/>
+										</td>
+										<td>
+											<c:out value="${list.eduStrtPnttm}"/>
+										</td>
+										<td>
+											<ve:code codeId="VE0003" code="${list.aprvlCd}"/>
+										</td>
+										<td>
+											<ve:code codeId="VEA003" code="${list.aplctStateCd}"/>
+											<!-- 취소요청 내용이 있고 미이수, 이수인 상태 -->
+											<c:if test="${not empty list.cnclCn and (list.aplctStateCd eq 10 or list.aplctStateCd eq 20)}">
+												(취소-반려)
+											</c:if>
+										</td>
+								</c:forEach>
+							</c:when>
+							<c:otherwise>
+								<tr>
+									<td colspan="5">교육정보가 없습니다.</td>
+								</tr>
+							</c:otherwise>
+						</c:choose>
+						
+				
+					</tbody>					
+				</table>
+			</div>				
+  
+			<!-- list_top -->			
+		
+		
 			<!-- 비공개 메보 정보 -->
 			<div class="tb_tit01">
 				<p>비공개 메모</p>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp
index ded0e3ff..b547d7fe 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtDetail.jsp
@@ -698,6 +698,71 @@
 			
 		</c:if>
 
+			
+			<div class="tb_tit01">
+				<p>교육이력정보</p>
+			</div>
+			
+			<div class="tb_type01">
+				<table>
+					<colgroup>
+						<col style="width: 10%">
+						<col style="width: auto;">
+						<col style="width: 180px;">						
+						<col style="width: 180px;">
+						<col style="width: 180px;">
+					</colgroup>
+					<thead>
+					<tr>						
+						<th>번호</th>
+						<th>교육명</th>
+						<th>교육일</th>
+						<th>확정여부</th>
+						<th>교육상태</th>												
+					</tr>
+					</thead>					
+					<tbody>
+						<c:choose>
+							<c:when test="${!empty cndtnTrgtMngVOList}">
+								<c:forEach var="list" items="${cndtnTrgtMngVOList}" varStatus="status">
+									<tr>
+										<td>
+											<c:out value="${status.count}"/>
+										</td>
+										<td>
+											<c:out value="${list.title}"/>
+										</td>
+										<td>
+											<c:out value="${list.eduStrtPnttm}"/>
+										</td>
+										<td>
+											<ve:code codeId="VE0003" code="${list.aprvlCd}"/>
+										</td>
+										<td>
+											<ve:code codeId="VEA003" code="${list.aplctStateCd}"/>
+											<!-- 취소요청 내용이 있고 미이수, 이수인 상태 -->
+											<c:if test="${not empty list.cnclCn and (list.aplctStateCd eq 10 or list.aplctStateCd eq 20)}">
+												(취소-반려)
+											</c:if>
+										</td>
+								</c:forEach>
+							</c:when>
+							<c:otherwise>
+								<tr>
+									<td colspan="5">교육정보가 없습니다.</td>
+								</tr>
+							</c:otherwise>
+						</c:choose>
+						
+				
+					</tbody>					
+				</table>
+			</div>				
+  
+			<!-- list_top -->
+			
+
+
 			<!-- 비공개 메보 정보 -->
 			<div class="tb_tit01">
 				<p>비공개 메모</p>
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp
index 9960239e..1ef658bb 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtMngDetail.jsp
@@ -697,6 +697,70 @@
 					
 			
 		</c:if>
+		
+		
+			<div class="tb_tit01">
+				<p>교육이력정보</p>
+			</div>
+			
+			<div class="tb_type01">
+				<table>
+					<colgroup>
+						<col style="width: 10%">
+						<col style="width: auto;">
+						<col style="width: 180px;">						
+						<col style="width: 180px;">
+						<col style="width: 180px;">
+					</colgroup>
+					<thead>
+					<tr>						
+						<th>번호</th>
+						<th>교육명</th>
+						<th>교육일</th>
+						<th>확정여부</th>
+						<th>교육상태</th>												
+					</tr>
+					</thead>					
+					<tbody>
+						<c:choose>
+							<c:when test="${!empty cndtnTrgtMngVOList}">
+								<c:forEach var="list" items="${cndtnTrgtMngVOList}" varStatus="status">
+									<tr>
+										<td>
+											<c:out value="${status.count}"/>
+										</td>
+										<td>
+											<c:out value="${list.title}"/>
+										</td>
+										<td>
+											<c:out value="${list.eduStrtPnttm}"/>
+										</td>
+										<td>
+											<ve:code codeId="VE0003" code="${list.aprvlCd}"/>
+										</td>
+										<td>
+											<ve:code codeId="VEA003" code="${list.aplctStateCd}"/>
+											<!-- 취소요청 내용이 있고 미이수, 이수인 상태 -->
+											<c:if test="${not empty list.cnclCn and (list.aplctStateCd eq 10 or list.aplctStateCd eq 20)}">
+												(취소-반려)
+											</c:if>
+										</td>
+								</c:forEach>
+							</c:when>
+							<c:otherwise>
+								<tr>
+									<td colspan="5">교육정보가 없습니다.</td>
+								</tr>
+							</c:otherwise>
+						</c:choose>
+						
+				
+					</tbody>					
+				</table>
+			</div>				
+  
+			<!-- list_top -->		
+		
 			<!-- 비공개 메보 정보 -->
 			<div class="tb_tit01">
 				<p>비공개 메모</p>