From f560491f87c948546f30319358056182407cff92 Mon Sep 17 00:00:00 2001
From: jiwoo <jiwoo@DESKTOP-SIDMR4Q>
Date: Fri, 24 Nov 2023 14:10:35 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EA=B4=80?=
 =?UTF-8?q?=EB=A6=AC=EC=9E=90=20=EC=B2=AD=EC=86=8C=EB=85=84=20=EA=B5=90?=
 =?UTF-8?q?=EC=9C=A1=EA=B2=B0=EA=B3=BC=EA=B4=80=EB=A6=AC=20>=20=EA=B2=B0?=
 =?UTF-8?q?=EA=B3=BC=EB=B3=B4=EA=B3=A0=20=EB=8B=A4=EC=9A=B4=EB=A1=9C?=
 =?UTF-8?q?=EB=93=9C=20=EC=A1=B0=EA=B1=B4=EC=A0=88=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml      | 17 ++++++++++++-----
 .../sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml |  6 +++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
index 2aaf30bc..60ef86fe 100644
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEdu_MIX_SQL_Tibero.xml
@@ -4188,10 +4188,10 @@
 			AND a.aprvl_cd = '60'
 			AND NVL(A.USE_YN, 'Y') <![CDATA[ <> ]]> 'N'
 			<isNotEmpty property="searchStartDt">
-				AND b.EDU_HOPE_DT <![CDATA[ >= ]]> REPLACE(#searchStartDt#, '.' , '')
+				AND REPLACE(b.EDU_HOPE_DT, '.' , '') <![CDATA[ >= ]]> REPLACE(#searchStartDt#, '.' , '')
 			</isNotEmpty>
 			<isNotEmpty property="searchEndDt">
-				AND b.EDU_HOPE_DT <![CDATA[ <= ]]> REPLACE(#searchEndDt#, '.' , '')
+				AND REPLACE(b.EDU_HOPE_DT, '.' , '') <![CDATA[ <= ]]> REPLACE(#searchEndDt#, '.' , '')
 			</isNotEmpty>
 			<isNotEmpty property="searchStratAprvlPnttm">
 				AND TO_CHAR(A.APRVL_PNTTM, 'YYYYMMDD') <![CDATA[ >= ]]> REPLACE(#searchStratAprvlPnttm#, '.' , '')
@@ -4217,14 +4217,14 @@
 						)
 					)
 			</isNotEmpty>
-			<isEmpty property="searchCondition">
+			<isNotEmpty property="searchCondition">
 				<isNotEmpty property="searchKeyword">
 					AND (
 						A.SCHOL_INSTT_NM LIKE '%'||#searchKeyword#||'%' OR
 						A.INSTT_NM LIKE '%'||#searchKeyword#||'%'
 					)
 				</isNotEmpty>
-			</isEmpty>
+			</isNotEmpty>
 			
 			<isNotEmpty property="searchAsgnmAprvlCd">
 				<isEqual property="searchAsgnmAprvlCd" compareValue="90">
@@ -4267,7 +4267,14 @@
 	         ) > 0
 	         */
 		</isNotEmpty>			
-				
+		<isNotEmpty property="searchSubmitYn">	
+			<isEqual property="searchSubmitYn" compareValue="Y">
+				AND c.sbmt_yn = 'Y'
+			</isEqual>
+			<isEqual property="searchSubmitYn" compareValue="N">
+				AND (c.sbmt_yn != 'Y' or c.sbmt_yn is null) 
+			</isEqual>
+		</isNotEmpty>
 		ORDER BY
 			1
 			, b.edu_chasi_ord
diff --git a/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml
index a225182e..fbc0d043 100644
--- a/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/rprt/VEEduRsltRprt_SQL_Tibero.xml
@@ -70,12 +70,12 @@
 	<!-- 강사 등록 C -->
 	<insert id="VEEduRsltRprtDAO.insert" parameterClass="VEEduRprtVO">
 		
-		MERGE INTO <include refid="VEEduRsltRprtDAO.table_name"/> T1 USING DB_ROOT
+		MERGE INTO <include refid="VEEduRsltRprtDAO.table_name"/> T1 USING DUAL
 		ON (T1.EDU_APLCT_ORD = #eduAplctOrd# AND T1.EDU_CHASI_ORD = #eduChasiOrd#)
 		WHEN MATCHED THEN
 			UPDATE SET
-				edu_aplct_ord                      = #eduAplctOrd#,
-				edu_chasi_ord                      = #eduChasiOrd#,
+				<!-- edu_aplct_ord                      = #eduAplctOrd#,
+				edu_chasi_ord                      = #eduChasiOrd#, -->
 	
 				sbmt_yn                            = #sbmtYn#,
 				sbmt_pnttm                         = #sbmtPnttm#,

From d850c7f7fd995dd742aa3a8c2bbac6d94635a7f9 Mon Sep 17 00:00:00 2001
From: tolag3 <tolag3@gmail.com>
Date: Fri, 24 Nov 2023 15:14:59 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=B0=BE?=
 =?UTF-8?q?=EA=B5=90=20=EC=BB=A4=EB=B0=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

 - 기반강화 교육신청 시 개인정보 커밋
---
 .../web/FndtnEnhanceTrnController.java        |   5 +
 .../prcsInfo/service/VEPrcsDetailVO.java      |  17 ++
 .../sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml   |  10 +-
 .../ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp | 146 +++++++++++++++++-
 4 files changed, 168 insertions(+), 10 deletions(-)

diff --git a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java
index 60f71b76..f45253a3 100644
--- a/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java
+++ b/src/main/java/kcc/ve/aplct/fndtnEnhanceTrn/web/FndtnEnhanceTrnController.java
@@ -504,6 +504,11 @@ public class FndtnEnhanceTrnController {
 	    	vEEduAplctVO.setUserId(loginVO.getUniqId());
 	    	vEEduAplctVO.setPrcsOrd(vEPrcsDetailVO.getPrcsAplctPrdOrd());
 	    	
+	    	vEEduAplctVO.setChrgNm(vEPrcsDetailVO.getChrgNm());
+	    	vEEduAplctVO.setInsttNm(vEPrcsDetailVO.getInsttNm());
+	    	vEEduAplctVO.setdBirth(vEPrcsDetailVO.getdBirth());
+	    	
+	    	
 	    	fndtnEnhanceTrnService.insertVeEduAplct(vEEduAplctVO);
 
 	        
diff --git a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java
index 186b71ab..73e539f3 100644
--- a/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java
+++ b/src/main/java/kcc/ve/instr/tngrVisitEdu/prcsInfo/service/VEPrcsDetailVO.java
@@ -154,6 +154,10 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
 	
 	private String mberNm;  
 	
+	private String chrgNm;  
+	private String insttNm;  
+	
+	
 	
 	
 	
@@ -749,6 +753,19 @@ public class VEPrcsDetailVO extends ComDefaultVO implements Serializable {
 	public void setMberNm(String mberNm) {
 		this.mberNm = mberNm;
 	}
+	public String getChrgNm() {
+		return chrgNm;
+	}
+	public void setChrgNm(String chrgNm) {
+		this.chrgNm = chrgNm;
+	}
+	public String getInsttNm() {
+		return insttNm;
+	}
+	public void setInsttNm(String insttNm) {
+		this.insttNm = insttNm;
+	}
+	
 	
 	
 }
diff --git a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
index a87c24f6..c13bad0b 100644
--- a/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/edu/VEEduAplct_SQL_Tibero.xml
@@ -270,7 +270,10 @@
 				
 				FRST_REGIST_PNTTM,
 				FRST_REGISTER_ID,
-				USE_YN
+				USE_YN,
+				CHRG_NM,
+				INSTT_NM,
+				D_BIRTH
 		)VALUES(
 			#eduAplctOrd#,
 			#lctrDivCd#,
@@ -285,7 +288,10 @@
 			
 			SYSDATE,
 			#frstRegisterId#,
-			'Y'
+			'Y',
+			#chrgNm#,
+			#insttNm#,
+			#dBirth#
 		)
 	</insert>
 	
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp
index 2b554295..ccbe2631 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/fndtnEnhanceTrn/eduAplctList.jsp
@@ -11,6 +11,9 @@
 <un:useConstants var="VeConstants" className="kcc.ve.cmm.VeConstants" />
 <title>교육신청 목록 > 성인 찾아가는 저작권 교육 > 한국저작권위원회 저작권 교육 시스템</title>
 <meta http-equiv="content-type" content="text/html; charset=utf-8">
+<style>
+	.duet-date__dialog-content,.duet-date__dialog{max-width:400px;width:364px;}
+</style>
 <script type="text/javaScript" language="javascript">
 
 
@@ -128,14 +131,41 @@ $(document).ready(function(){
         }
 
         // 텍스트가 "접수중"인지 확인
-        if ($thisCell.text().trim() !== "접수중") {
-            $applyButton.prop('disabled', true);  // 버튼 비활성화
+//         if ($thisCell.text().trim() !== "접수중") {
+//             $applyButton.prop('disabled', true);  // 버튼 비활성화
+//         }
+        if ($thisCell.text().trim() === "접수중") {
+            $applyButton.prop('disabled', false);  // 버튼 비활성화
         }
     });
-	
+	  
+    const dBirth = document.querySelector(".dBirth");
+    dBirth.localization = {
+    		placeholder: '생년월일을 선택하세요',
+    		selectedDateMessage: 'Selected date is',
+    		prevMonthLabel: '이전 달 보기',
+    		nextMonthLabel: '다음 달 보기',
+    		monthSelectLabel: '달 선택',
+    		yearSelectLabel: '년도 선택',
+    		closeLabel: '달력 닫기',
+    		dayNames: ['일', '월', '화', '수', '목', '금', '토'],
+    		monthNames: ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월'],
+    		monthNamesShort: ['1월', '2월', '3월', '4월', '5월', '6월', '7월', '8월', '9월', '10월', '11월', '12월'],
+    		identifier: "searchStartDt",
+    		incrementYears:100,
+    	}
 	
 });
-
+	
+	function fn_prcsAplctPrdOrdSet(obj){
+		console.log($(obj).closest('tr').attr("data-value"));
+		regForm.prcsAplctPrdOrd.value = $(obj).closest('tr').attr("data-value");
+		$('#regButton').attr("onclick", "fncEduReg('"+$('#regForm [name=prcsAplctPrdOrd]').val()+"');");
+		console.log($(obj).closest('td').find('.prcsNm_popNm').text());
+		$('#popNm').text($(obj).closest('tr').find('.prcsNm_popNm').text());
+		
+		$('#popForm').find('input').val('');
+	}
 
 	function fn_dayDiff(item){
 
@@ -199,9 +229,36 @@ $(document).ready(function(){
 		
 	}
 
+	function fnValidation(){
+		var chrgNm = document.popForm.chrgNm.value;
+		var insttNm = document.popForm.insttNm.value;
+		var dBirth = document.popForm.dBirth.value;
+
+		if(chrgNm == ''){
+			alert('성명을 입력해 주세요.');
+			return false;
+		}else if(insttNm ==''){
+			alert('소속기업을 입력해 주세요.');
+			return false;
+		}else if(dBirth ==''){
+			alert('생년월일을 입력해 주세요.');
+			return false;
+		}
+		return true;
+	}
+	
 	function fncEduReg(prcsAplctPrdOrd){
+		
+		
+		if(!fnValidation()){
+			return false;
+		}
+		
 		var regForm = document.regForm;
 		regForm.prcsAplctPrdOrd.value = prcsAplctPrdOrd;
+		regForm.chrgNm.value = document.popForm.chrgNm.value;
+		regForm.insttNm.value = document.popForm.insttNm.value;
+		regForm.dBirth.value = document.popForm.dBirth.value;
 		
 		var data = new FormData(document.getElementById("regForm"));
 		if(confirm("신청하시겠습니까?")){
@@ -227,6 +284,8 @@ $(document).ready(function(){
 				}
 			});
 		}
+		
+		$('#target_confirm_popup-close').click();
 	}
 	
 	function linkPage(pageNo){
@@ -273,6 +332,10 @@ $(document).ready(function(){
 
 	<form name="regForm" id="regForm">
 		<input type="hidden" name="prcsAplctPrdOrd">
+		<input type="hidden" name="chrgNm">
+		<input type="hidden" name="insttNm">
+		<input type="hidden" name="dBirth">
+		
 	</form>
 	<form name="selectForm" id="selectForm">
 		<input type="hidden" name="lctrDivCd" value="50">
@@ -391,14 +454,14 @@ $(document).ready(function(){
 					</thead>
 					<tbody>
 					<c:forEach var="list" items="${list}" varStatus="status">
-						<tr class="listCount">
+						<tr class="listCount" data-value="<c:out value="${list.prcsAplctPrdOrd}"/>">
 	<%-- 						<td onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');" style="cursor:pointer;">									 --%>
 	<%-- 							<c:out value="${status.count}"/> --%>
 	<!-- 						</td> -->
 							<td>
 								<kc:code codeId="VEA001" code="${list.prcsDiv}"/>
 							</td>
-							<td onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');" style="cursor:pointer;">									
+							<td class="prcsNm_popNm" onclick="fncGoDetail('<c:out value="${list.prcsAplctPrdOrd}"/>');" style="cursor:pointer;">									
 								<c:out value="${list.prcsNm}"/>(<c:out value="${list.prcsAplctPrdOrd}"/>)
 							</td>
 							<td>
@@ -423,7 +486,8 @@ $(document).ready(function(){
 									</c:choose>
 								</td>
 								<td class="aplctBtn">
-									<button type="button" class="btnType04" onclick="fncEduReg('<c:out value="${list.prcsAplctPrdOrd}"/>');">신청</button>
+									<%-- <button type="button" class="btnType04" onclick="fncEduReg('<c:out value="${list.prcsAplctPrdOrd}"/>');" disabled>신청</button> --%>
+									<button type="button" class="btnType04" onclick="fn_prcsAplctPrdOrdSet(this);" data-tooltip="target_confirm_popup" disabled>신청</button>
 								</td>
 							</c:if>
 						</tr>
@@ -538,4 +602,70 @@ $(document).ready(function(){
 		</div>
 		
 	</form:form>
-</div>
\ No newline at end of file
+</div>
+
+
+<form id="popForm" name="popForm" method="post">
+	<!-- 신청인정보 -->
+	<div class="tooltip-wrap q_pop">
+		<div class="popup_wrap popType01" tabindex="0" data-tooltip-con="target_confirm_popup" data-focus="target_confirm_popup" data-focus-prev="target_confirm_popup_close">
+			<div class="popup_tit">
+				<p id="popNm">신청인정보</p>
+				<button class="btn_popup_close tooltip-close" data-focus="target_confirm_popup_close" title="팝업 닫기"><i></i></button>
+			</div>
+			<div class="popup_cont">
+				<div class="cont_body">
+					<div class="pop_tb_type01" style="overflow:visible;">
+						<table>
+		                    <caption>신청인정보를 입력하는 표</caption>
+		                    <colgroup>
+		                        <col style="width: 145px;">
+		                        <col style="width: auto;">
+		                    </colgroup>
+		                    <tbody>
+								<tr>
+									<th scope="row">
+										<p>성명</p>
+									</th>
+									<td>
+										<input type="text" name="chrgNm" id="chrgNm"/>
+									</td>
+								</tr>		
+								<tr>
+									<th scope="row">
+										<p>소속기업</p>
+									</th>
+									<td>
+										<input type="text" name="insttNm" id="insttNm"/>
+									</td>
+								</tr>
+								<tr>
+									<th scope="row">
+										<p>생년월일</p>
+									</th>
+									<td>
+										<div class="calendar_wrap">
+											<duet-date-picker identifier="date" class="dBirth" name="dBirth" min="1940-01-01" max="2025-12-31"></duet-date-picker>
+										</div>
+									</td>
+								</tr>
+		                    </tbody>
+		                </table>
+
+					</div>
+					<div class="pop_btn_wrap btn_layout01">
+						<div class="btn_left">
+						</div>
+						<div class="btn_center">
+							<button type="button" class="btnType05" id="regButton">문의</button>
+							<button type="button" class="btnType02 tooltip-close" id="target_confirm_popup-close" data-focus="target_confirm_popup-close" data-focus-next="target_confirm_popup">취소</button>
+						</div>
+						<div class="btn_right">
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<!--// 신청 클릭 > 기소유예 대상자 확인 팝업 -->
+</form>
\ No newline at end of file