From f8a0a4639fd506c03334f9ed0f47d156b1fde04b Mon Sep 17 00:00:00 2001
From: hylee <hehihoho3@gmail.com>
Date: Fri, 15 Mar 2024 14:17:37 +0900
Subject: [PATCH] =?UTF-8?q?pms#3753=20[=EA=B4=80=EB=A6=AC=EC=9E=90]=20?=
 =?UTF-8?q?=EA=B8=B0=EC=86=8C=EC=9C=A0=EC=98=88=20=EB=8C=80=EC=83=81?=
 =?UTF-8?q?=EC=9E=90=20=EC=9D=98=EB=A2=B0=20=EC=B7=A8=EC=86=8C=20=ED=8C=9D?=
 =?UTF-8?q?=EC=97=85=EC=8B=9C=20=EC=98=A4=EB=A5=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trgtMng/web/CndtnTrgtMngController.java           | 11 ++++++++---
 .../web/CndtnPrcsInfoMngController.java               |  1 +
 .../oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp    |  4 ++--
 .../WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp     |  9 ++++++++-
 4 files changed, 19 insertions(+), 6 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 07c0d77e..a294bcfb 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
@@ -279,12 +279,17 @@ public class CndtnTrgtMngController {
 		
 		LoginVO loginVO = checkLoginUtil.getAuthLoginVO(); //권한에 따른 로그인 정보 가져오기
 		cndtnTrgtMngVO.setLastUpdusrId(loginVO.getUniqId());
-		try {
 
+		// 대괄호 제거
+		List<String> resultList = new ArrayList<>();
+        for (String list : cndtnTrgtMngVO.getSspnIdtmtTrgtOrdList()) {
+            resultList.add(list.replace("[","").replace("]","")); // 내부 리스트의 모든 요소를 resultList에 추가
+        }
 		
+        cndtnTrgtMngVO.setSspnIdtmtTrgtOrdList(resultList);
+        
+		try {
 			cndtnTrgtInfoMngService.updateEduStateCdAndReqStateCdAjax(cndtnTrgtMngVO);
-			
-			
 			modelAndView.addObject("result", "success");
 			
 		} catch (Exception ex) {
diff --git a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
index 75959a86..4b7f0caf 100644
--- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
@@ -1921,6 +1921,7 @@ public class CndtnPrcsInfoMngController {
 		//VEPrcsDetailVO info = vEPrcsAplctPrdService.findByCnclInfo(vEPrcsDetailVO); 
 
 		System.out.println("=====================");
+		System.out.println("===================== :: "+ vEPrcsDetailVO.getSspnIdtmtTrgtOrdList().toString());
 
     	//파일 정보 가져오기
 //    	FileVO fileVO = new FileVO(); 
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp
index 2f11d746..900df66e 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.jsp
@@ -70,8 +70,8 @@
 				success : function(returnData) {
 					if (returnData.result == "success") {
 						alert("변경 처리 되었습니다.");
-						opener.location.reload();
-						//window.close();
+// 						opener.location.reload();
+						window.close();
 					} else {
 						alert("변경 중 오류가 발생하였습니다.");
 					}
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp
index 8591de4c..802896e0 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/trgtList.jsp
@@ -326,10 +326,17 @@
 			//document.listForm.eduAplctOrd.value = eduAplctOrd;
 			//document.listForm.eduChasiOrd.value = eduChasiOrd;
 			document.popForm.action = "<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.do'/>";
-			window.open("", "_CancelStatusPopup", "scrollbars = no, top=100px, left=100px, height=750px, width=750px");    
+			var popup = window.open("", "_CancelStatusPopup", "scrollbars = no, top=100px, left=100px, height=750px, width=750px");    
 			document.popForm.target = "_CancelStatusPopup";
 			document.popForm.submit();	
 
+		    var timer = setInterval(function() { 
+		        if(popup.closed) { 
+		            clearInterval(timer);
+					window.location.reload();
+		        }
+		    }, 1000);
+
 			/*
 			commonPopWindowopenForm(
 					"<c:url value='/kccadr/oprtn/cndtnSspnIdtmt/popup/cnclStatusPopup.do'/>"