From 390357a463950a43411527e3fad1e8d782d26f7e Mon Sep 17 00:00:00 2001
From: hylee <hehihoho3@gmail.com>
Date: Mon, 23 Oct 2023 10:39:11 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=20=EA=B8=B0?=
 =?UTF-8?q?=EC=86=8C=EC=9C=A0=EC=98=88=20-=20=EB=8C=80=EC=83=81=EC=9E=90?=
 =?UTF-8?q?=20=EC=A1=B0=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java | 5 ++---
 .../kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java    | 5 +++++
 .../cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java     | 7 +++++++
 .../sqlmap/ve/cndtn/cndtnTrgtInfoMng_SQL_Tibero.xml        | 6 ++++--
 4 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java
index 1d7c4e65..1f13b17c 100644
--- a/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java
+++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/service/impl/SspnIdtmtServiceImpl.java
@@ -50,7 +50,7 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService {
 			result="success";
 //
 //			// 교육 신청한 대상자 조회
-			id = cndtnTrgtInfoMngDAO.findByTrgtNmAndDBirthAndUserIdAndEduStateCd(cndtnTrgtInfoMngVO);
+			id = cndtnTrgtInfoMngDAO.findByTrgtNmAndDBirthAndEduStateCd(cndtnTrgtInfoMngVO);
 
 			if(StringUtils.isNotEmpty(id)) {
 				msg = "이미 신청한 대상자 입니다.";
@@ -59,10 +59,9 @@ public class SspnIdtmtServiceImpl implements SspnIdtmtService {
 			// 신청하지 않은 대상자가 있는지 조회
 			}else {
 				
-
+				id = cndtnTrgtInfoMngDAO.findByTrgtNmAndDBirthAndUserIdAndEduStateCd(cndtnTrgtInfoMngVO);
 				msg = "대상자가 없습니다.";
 				
-				id = cndtnTrgtInfoMngDAO.findByTrgtNmAndDBirthAndEduStateCd(cndtnTrgtInfoMngVO);
 				if(StringUtils.isNotEmpty(id)) {
 					msg = "확인됐습니다.";
 					next = "Y";
diff --git a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java
index fa1ca97e..a221c949 100644
--- a/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java
+++ b/src/main/java/kcc/ve/aplct/sspnIdtmt/web/SspnIdtmtController.java
@@ -466,6 +466,11 @@ public class SspnIdtmtController {
 
 				cndtnTrgtMngVO.setUserId(loginVO.getUniqId());
 				cndtnTrgtMngVO.setSspnIdtmtTrgtOrd(vEPrcsDetailVO.getSspnIdtmtTrgtOrd());
+				cndtnTrgtMngVO.setEduStateCd("25"); // 신청
+				cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(vEPrcsDetailVO.getPrcsAplctPrdOrd()); // 교육 번호
+//				, edu_state_cd				= #eduStateCd#   
+//				, prcs_aplct_prd_ord_cmplt	= #prcsAplctPrdOrdCmplt#
+				
 		    	
 		    	cndtnTrgtInfoMngService.updateUserId(cndtnTrgtMngVO);
 		    	
diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java
index 702a9945..8a7416a5 100644
--- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java
+++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/trgtMng/service/CndtnTrgtMngVO.java
@@ -36,6 +36,7 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable {
 	private String reqNmbr;				// 의뢰번호
 	private String prsctrNm;			// 검사성명 
 	private String reqStateCd;			// 의뢰상태코드 
+	private String prcsAplctPrdOrdCmplt;// 중복확인을 위한 신청강의 PK 
 
 
 	
@@ -169,6 +170,12 @@ public class CndtnTrgtMngVO extends ComDefaultVO implements Serializable {
 	public void setReqStateCd(String reqStateCd) {
 		this.reqStateCd = reqStateCd;
 	}
+	public String getPrcsAplctPrdOrdCmplt() {
+		return prcsAplctPrdOrdCmplt;
+	}
+	public void setPrcsAplctPrdOrdCmplt(String prcsAplctPrdOrdCmplt) {
+		this.prcsAplctPrdOrdCmplt = prcsAplctPrdOrdCmplt;
+	}
 	
 	
 	
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 ce050959..4baddcf0 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
@@ -137,8 +137,10 @@
 		UPDATE 
 			<include refid="CndtnTrgtInfoMngDAO.table_name"/> 
 		SET						  
-			user_id            = #userId#           
-			, req_state_cd     = #reqStateCd#
+			user_id						= #userId#           
+			, req_state_cd				= #reqStateCd#   
+			, edu_state_cd				= #eduStateCd#   
+			, prcs_aplct_prd_ord_cmplt	= #prcsAplctPrdOrdCmplt#
 		WHERE
 			sspn_idtmt_trgt_ord = #sspnIdtmtTrgtOrd#
 	</update>