From 5085d874dabc4ad39b11bf8e630015af03ef3fed Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Tue, 23 Jan 2024 15:24:51 +0900
Subject: [PATCH] =?UTF-8?q?2024-01-23=2015:24=20=EB=8C=80=EC=83=81?=
 =?UTF-8?q?=EC=9E=90=20=EC=83=9D=EB=85=84=EC=9B=94=EC=9D=BC=20=EC=A0=95?=
 =?UTF-8?q?=EB=B3=B4=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trgtMng/web/CndtnTrgtMngController.java   | 22 +++++------
 .../cndtnSspnIdtmt/popup/excelUploadPopup.jsp |  4 +-
 .../aplct/sspnIdtmt/popup/eduAplctPopList.jsp | 38 ++++++++++++++++++-
 .../usr/publish/script/duetdatepicker.js      |  1 +
 4 files changed, 49 insertions(+), 16 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 35d819d4..30fdfddf 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
@@ -778,26 +778,24 @@ public class CndtnTrgtMngController {
 					//병합이면 대상을 찾아서 넣는다.
 		        	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())) {
+			        	
+			        	//자기 자신으로 병합되지는 않는다.
+			        	if (cndtnTrgtMergeVO!=null && !cndtnTrgtMergeVO.getReqNmbr().equals(cndtnTrgtMngVO.getReqNmbr())) {
 			        		cndtnTrgtMngVO.setPrcsAplctPrdOrdCmplt(cndtnTrgtMergeVO.getSspnIdtmtTrgtOrd());
 			        	}		        		
 		        	}
 		        	
+		        	//excel 데이터를 넣거나, 업데이트 한다.
 		        	i+=cndtnTrgtInfoMngService.insert4Merge(cndtnTrgtMngVO);
-		        }
-		        	
-		        /*
-		        for (int i=0;i<trgtExcelVOList.size();i++) {
-		        	
-		        }
-		        cndtnTrgtInfoMngService.bulkInsert(trgtExcelVOList);
-		        */
-
-			
-			
+		        }		        				
 			
+		        modelAndView.addObject("resultCnt", i);
+		        
 			} catch (Exception e) {
 				// TODO: handle exception
 				modelAndView.addObject("result", "fail");
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/excelUploadPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/excelUploadPopup.jsp
index 3294c91d..1b7a0ecf 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/excelUploadPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/excelUploadPopup.jsp
@@ -65,9 +65,9 @@
 				success:function(returnData){
 					console.log('returnData :: ', returnData);
 					if(returnData.result == "success"){
-						alert("등록되었습니다.");
+						alert(returnData.resultCnt+"건 등록되었습니다.");
 // 						fncGoList();
-						$('#sspnIdtmtTrgtOrd').val(returnData.sspnIdtmtTrgtOrd);
+						//$('#sspnIdtmtTrgtOrd').val(returnData.sspnIdtmtTrgtOrd);
 						// 중복체크 ajax
 // 						fn_duplChk();
 					}else if(returnData.result == "fail"){
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp
index 48f2a441..07acb339 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/sspnIdtmt/popup/eduAplctPopList.jsp
@@ -248,11 +248,14 @@ $(document).ready(function(){
 									<th scope=“row”>주민번호앞자리</th>
 									<td>
 										<div class="calendar_wrap">
-											<duet-date-picker identifier="date" id="dBirth" class="" id="" min="1940-01-01"></duet-date-picker>
+											<duet-date-picker identifier="date" id="dBirth" class="" min="1940-01-01"></duet-date-picker>
 											<script>
 											
 												$('.calendar_wrap').each(function(){
-											      $(this).find('.duet-date__input').attr('onkeydown','this.value=dateSetting(this.value);');
+											      //$(this).find('.duet-date__input').attr('onkeydown','this.value=dateSettingHere(this.value);');
+											      
+											      $(this).find('.duet-date__input').attr('onblur','this.value=dateSettingHere(this.value);');
+											      
 											   });
 												var dBirth = document.querySelector("#dBirth");
 												var DATE_FORMAT = /^(\d{1,2})\.(\d{1,2})\.(\d{4})$/
@@ -314,6 +317,37 @@ $(document).ready(function(){
 													dBirth.addEventListener("duetFocus", function (e) {
 														calendarSetting();
 													});
+
+												function dateSettingHere(objValue) {
+													var v = objValue.replace("..", ".");
+													if (v.match(/^\d{4}$/) !== null) {
+														if (event.keyCode == "8") {
+															// 백스페이스 키를 누를 때 '.' 안생기게
+														} else {
+															v = v + '.';
+														}
+													} else if (v.match(/^\d{4}\.\d{2}$/) !== null) {
+														if (event.keyCode == "8") {
+															// 백스페이스 키를 누를 때 '.' 안생기게
+														} else {
+															v = v + '.';
+														}
+													}
+													
+													if (v.length==10){
+														$('#dBirth').val(v);														
+													}else{
+														$('#dBirth').val(v);
+													}
+													
+													// '-' 막기
+													if (event.keyCode == "189" || event.keyCode == "109") {
+														event.preventDefault();
+														return v;
+													} else {}
+
+													return v;
+												}												
 											</script>
 										</div>
 										<%-- <script src="${pageContext.request.contextPath}/visitEdu/usr/publish/script/duetdatepicker2.js"></script> --%>
diff --git a/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js b/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js
index b9308724..d55cd093 100644
--- a/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js
+++ b/src/main/webapp/visitEdu/usr/publish/script/duetdatepicker.js
@@ -206,6 +206,7 @@ $(window).on('load',function(){
 function calendarSetting(){
    $('.calendar_wrap').each(function(){
       $(this).find('.duet-date__input').attr('onkeydown','this.value=dateSetting(this.value);');
+      $(this).find('.duet-date__input').attr('onblur','this.value=dateSettingHere(this.value);');
    });
 }