From a7161f52a8c8b264366634383d45235676b2b31b Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Mon, 30 Oct 2023 11:16:36 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=84=B1?=
 =?UTF-8?q?=EC=9D=B8=EA=B5=90=EC=9C=A1=20=EA=B0=95=EC=82=AC=EC=B0=B8?=
 =?UTF-8?q?=EC=84=9D=ED=99=95=EC=9D=B8=EC=84=9C=20=EC=9E=91=EC=97=85?=
 =?UTF-8?q?=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml     |  2 ++
 .../ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp |  5 +++++
 .../adultVisitEdu/endInfo/instrEduEndDetail.jsp    | 14 ++++++++++++++
 3 files changed, 21 insertions(+)

diff --git a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
index 0d667e5e..316215c5 100644
--- a/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/asgnm/VEAsgnm_MIX_SQL_Tibero.xml
@@ -776,6 +776,8 @@
 			, d.lctr_plan_atch_file_id AS lctrPlanAtchFileId
 			, d.user_id					 AS instrCnfrmId
 			, (SELECT COUNT(1) FROM ve_edu_chasi_instr_asgnm_hstry WHERE edu_aplct_ord = #eduAplctOrd# AND edu_chasi_ord = #eduChasiOrd#) AS hstryCnt
+			, b.attend_atch_file_id	AS attendAtchFileId
+			, b.pht_atch_file_id	AS phtAtchFileId
 		FROM   ve_edu_chasi a
 			JOIN ve_edu_aplct b
 				ON     a.edu_aplct_ord = b.edu_aplct_ord
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
index 262c5e3f..e6beae01 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/adultVisitEdu/eduEnd/eduEndDetail.jsp
@@ -21,12 +21,16 @@
 <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
 <%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%>
 
+
 <!-- for validator #1 -->
 <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator"%>
 <!-- for validator #1 -->
 
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
+<spring:eval expression="@property['Globals.Innorix.License']" var="license"/>
+<script src="<c:url value='/innorix/innorix_${license}.js' />"></script> 
+<script src="<c:url value='/js/kccadr/innorixCommon.js' />"></script>
 
 <!-- for validator #2 -->
 <script type="text/javascript" src="<c:url value="/validator.do"/>"></script>
@@ -1022,6 +1026,7 @@
 							<button type="button" class="btnType01 updownRoad" data-tooltip="sub35_pop01" id="ATTEND" onclick="filePopupLayer('ATTEND')" title="팝업 열림">강사 참석 확인서 업로드</button>
 						</c:otherwise>
 					</c:choose>
+					<button type="button" class="btnType01" onclick="location.href='${pageContext.request.contextPath}/cmm/fms/FileDown.do?atchFileId=FILE_000000000015299&amp;fileSn=1'" title="서약서 양식 다운로드">강사 참석 확인서 양식 다운로드</button>
 				</td>
 			</tr>
 			
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndDetail.jsp
index b93b810c..85992ff8 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/instr/adultVisitEdu/endInfo/instrEduEndDetail.jsp
@@ -294,6 +294,20 @@ $( document ).ready(function() {
 						</th>
 						<td colspan="3"><c:out value="${cryptoUtil.decrypt(info.email)}"/></td>
 					</tr>
+					
+					<tr>
+						<th scope="row">
+							<p>강사 참석 확인서</p>
+						</th>
+						<td colspan="3"><c:out value="${cryptoUtil.decrypt(info.chrgNm)}"/></td>
+					</tr>
+					<tr>
+						<th scope="row">
+							<p>교육 사진</p>
+						</th>
+						<td colspan="3"><c:out value="${cryptoUtil.decrypt(info.chrgNm)}"/></td>
+					</tr>
+					
 				</tbody>
 			</table>
 		</div>