From e1584ca4ad6eb3c77bd44396e001fe8f38db2d96 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Tue, 23 Jan 2024 14:19:29 +0900
Subject: [PATCH] =?UTF-8?q?2024-01-23=2014:18=20=EA=B5=90=EC=9C=A1?=
 =?UTF-8?q?=EB=8C=80=EC=83=81=EC=9E=90=20=EC=9D=BC=EC=9E=90=20=EB=84=A3?=
 =?UTF-8?q?=EA=B8=B0=20=EC=88=98=EC=A0=95=20=ED=95=84=EC=9A=94=ED=95=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trgtMng/web/CndtnTrgtMngController.java   | 20 +++++++++----------
 .../ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml  |  1 +
 .../web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp |  2 +-
 3 files changed, 12 insertions(+), 11 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 6486e780..35d819d4 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
@@ -753,16 +753,6 @@ public class CndtnTrgtMngController {
 		        	cndtnTrgtMngVO	=	egovCryptoUtil.encryptCndtnTrgtMngVOInfo(cndtnTrgtMngVO);
 		        	
 		        	
-					//병합이면 대상을 찾아서 넣는다.
-		        	System.out.println("cndtnTrgtMngVO.getMergeStatus()");
-		        	System.out.println(cndtnTrgtMngVO.getMergeStatus());
-		        	if (cndtnTrgtMngVO.getMergeStatus()!=null && !"".equals(cndtnTrgtMngVO.getMergeStatus())) {
-			        	CndtnTrgtMngVO cndtnTrgtMergeVO	=	cndtnTrgtInfoMngService.selectDetail4Merge(cndtnTrgtMngVO);
-			        	if (cndtnTrgtMergeVO!=null) {
-			        		cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(cndtnTrgtMergeVO.getSspnIdtmtTrgtOrd());
-			        	}		        		
-		        	}
-		        	
 		        	LOGGER.info(cndtnTrgtMngVO.toString());
 		        	
 		        	
@@ -785,6 +775,16 @@ public class CndtnTrgtMngController {
 		        LOGGER.info(" 엑셀 insert :: [{}]건", trgtExcelVOList.size());
 		        
 		        for(CndtnTrgtMngVO cndtnTrgtMngVO : trgtExcelVOList) {
+					//병합이면 대상을 찾아서 넣는다.
+		        	System.out.println("cndtnTrgtMngVO.getMergeStatus()");
+		        	System.out.println(cndtnTrgtMngVO.getMergeStatus());
+		        	if (cndtnTrgtMngVO.getMergeStatus()!=null && !"".equals(cndtnTrgtMngVO.getMergeStatus())) {
+			        	CndtnTrgtMngVO cndtnTrgtMergeVO	=	cndtnTrgtInfoMngService.selectDetail4Merge(cndtnTrgtMngVO);
+			        	if (cndtnTrgtMergeVO!=null && cndtnTrgtMergeVO.getTrgtNm().equals(cndtnTrgtMngVO.getTrgtNm())) {
+			        		cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(cndtnTrgtMergeVO.getSspnIdtmtTrgtOrd());
+			        	}		        		
+		        	}
+		        	
 		        	i+=cndtnTrgtInfoMngService.insert4Merge(cndtnTrgtMngVO);
 		        }
 		        	
diff --git a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml
index 945555d9..b00c9095 100644
--- a/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml
+++ b/src/main/resources/egovframework/sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml
@@ -252,6 +252,7 @@
 			AND trgt_nm=#trgtNm#
 			AND sex=#sex#
 			AND d_birth=#dBirth#
+			AND prcs_aplct_prd_ord_cmplt IS null
 		ORDER BY req_pnttm			
 		LIMIT 1
 	</select>	
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp
index 777024ce..221662ec 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp
@@ -400,7 +400,7 @@
 		<div class="btn_center">
 		</div>
 		<div class="btn_right" class="aplctBtn">
-			<button type="button" class="btnType04" id="regBtn" data-info="<c:out value="${info.prcsAplctPrdOrd}"/>" data-tooltip="target_confirm_popup" >신청</button>
+<%-- 			<button type="button" class="btnType04" id="regBtn" data-info="<c:out value="${info.prcsAplctPrdOrd}"/>" data-tooltip="target_confirm_popup" >신청</button> --%>
 			<button type="button" class="btnType04" data-tooltip="" 
 						onclick="fncAplctPopup('<c:out value="${list.prcsAplctPrdOrd}"/>','','','10','select'
 						,'','',''