From b1c740a5760f521c38e08c5f90008bceacbd61b1 Mon Sep 17 00:00:00 2001
From: hylee <hehihoho3@gmail.com>
Date: Fri, 12 Jan 2024 12:23:33 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20::=20=EA=B8=B0?=
 =?UTF-8?q?=EB=B0=98=20-=20=EA=B3=BC=EC=A0=95=20=EC=8B=A0=EC=B2=AD?=
 =?UTF-8?q?=EA=B8=B0=EA=B0=84=20=EC=83=81=EC=84=B8=20=EB=B0=98=EB=A0=A4=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC=20code=20=EC=B6=94=EA=B0=80=20=ED=9B=84=20?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/utl/fcc/service/EgovCryptoUtil.java   |  4 ++
 .../web/CndtnPrcsInfoMngController.java       |  8 +++-
 .../cndtnEduPrcsAplctPrdMngDetail.jsp         | 38 +++++++++-------
 .../web/ve/aplct/sspnIdtmt/eduAplctDetail.jsp | 44 +++++++++----------
 4 files changed, 54 insertions(+), 40 deletions(-)

diff --git a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java
index 9fcba00c..11298875 100644
--- a/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java
+++ b/src/main/java/kcc/let/utl/fcc/service/EgovCryptoUtil.java
@@ -642,8 +642,12 @@ public class EgovCryptoUtil {
 	public List<VEEduAplctVO> decryptVeEduAplctList(List<VEEduAplctVO> vEPrcsDetailVOList) {
 		
 		for(VEEduAplctVO vo : vEPrcsDetailVOList) {
+			vo.setEmail(this.decrypt(vo.getEmail()));
 			vo.setChrgNm(this.decrypt(vo.getChrgNm()));
 			vo.setUserNm(this.decrypt(vo.getUserNm()));
+			vo.setUserId(this.decrypt(vo.getUserId()));
+			vo.setPhone(this.decrypt(vo.getPhone()));
+			vo.setPhone(this.decrypt(vo.getPhone()));
 			vo.setPhone(this.decrypt(vo.getPhone()));
 			if (StringUtils.isNotEmpty( vo.getTrgtNm()) ) vo.setTrgtNm(this.decrypt(vo.getTrgtNm().trim()));
 //			}
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 992b4206..67b5c8fc 100644
--- a/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
+++ b/src/main/java/kcc/ve/oprtn/cndtnSspnIdtmt/web/CndtnPrcsInfoMngController.java
@@ -1154,6 +1154,9 @@ public class CndtnPrcsInfoMngController {
 	                "lctrDivCd" : $("#lctrDivCd").val() 
 	            };
 	        */
+			
+			
+			// 알림
 			 notifyManageService.insertNotifyAprvlCd5060ForUser(
 					 loginVO
 					 , vEPrcsDetailVO.getPrcsAplctPrdOrd()
@@ -2084,7 +2087,10 @@ public class CndtnPrcsInfoMngController {
 			
 			// 데이터가 있으면 삭제
 			if(vEDetail_DVO != null) {
-				vEDetailVO.setAplctStateCd("30");
+				// 이호영 20240112 
+				// 반려값 추가 (VEA003 - 50:반려)
+//				vEDetailVO.setAplctStateCd("30");
+				vEDetailVO.setAplctStateCd("50");
 				vEAPrcsAplctPrdInstrAsgnmService.updateAprvlCdEduAplctDetail(vEDetailVO);
 				
 			}
diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp
index 56edb82b..6d931c75 100644
--- a/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/oprtn/cndtnSspnIdtmt/cndtnEduPrcsAplctPrdMngDetail.jsp
@@ -507,11 +507,11 @@
 				<table>
 					<colgroup>
 						<col style="width: 5%">
-						<col style="width: 10%">
 						<col style="width: 5%">
-						<col style="width: 5%">
-						<col style="width: 5%">
-						<col style="width: 210px;">
+						<col style="width: 20%">
+						<col style="width: 17%">
+						<col style="width: 13%">
+						<col style="width: 110px;">
 						<col style="width: auto;">
 						<col style="width: 210px;">						
 					</colgroup>
@@ -534,14 +534,14 @@
 								<c:forEach var="list" items="${listPrcsAplct}" varStatus="status">
 									<tr>
 										<td>
-											<c:choose>
-												<c:when test="${list.aplctStateCd ne 30 and list.aplctStateCd ne 35}">
+<%-- 											<c:choose> --%>
+<%-- 												<c:when test="${list.aplctStateCd ne 30 and list.aplctStateCd ne 35}"> --%>
 													<input name="chk" class="${list.asgnmAprvlCd}" 
 													value="${list.eduAplctOrd}" title="Check" type="checkbox"/>
-												</c:when>
-												<c:otherwise>
-												</c:otherwise>
-											</c:choose>
+<%-- 												</c:when> --%>
+<%-- 												<c:otherwise> --%>
+<%-- 												</c:otherwise> --%>
+<%-- 											</c:choose> --%>
 										</td>
 										<td>
 											<c:out value="${list.trgtNm}"/>
@@ -569,15 +569,19 @@
 											</c:if>
 										</td>
 										<td>
-											<c:choose>
-												<c:when test="${list.aplctStateCd ne 30 and list.aplctStateCd ne 35}">
+<%-- 											<c:choose> --%>
+<%-- 												<c:when test="${list.aplctStateCd ne 30 and list.aplctStateCd ne 35}"> --%>
 													<button type="button" class="btn_type04" onclick="updateEduAplctOrd('20', '<c:out value="${list.eduAplctOrd }" />', '<c:out value="${info.prcsAplctPrdOrd }"/>')">승인</button>
 													<button type="button" class="btn_type05" onclick="updateEduAplctOrd('30', '<c:out value="${list.eduAplctOrd }" />', '<c:out value="${info.prcsAplctPrdOrd }"/>')">반려</button>
-												</c:when>
-												<c:otherwise>
-													<button type="button" class="btn_type05" onclick="fnCnclPopup('<c:out value="${list.eduAplctOrd }" />', '<c:out value="${info.prcsAplctPrdOrd }"/>')">취소요청</button>
-												</c:otherwise>
-											</c:choose>
+<%-- 												</c:when> --%>
+<%-- 												<c:when test="${list.aplctStateCd ne 30 and list.aplctStateCd ne 35}"> --%>
+<%-- 													<button type="button" class="btn_type04" onclick="updateEduAplctOrd('20', '<c:out value="${list.eduAplctOrd }" />', '<c:out value="${info.prcsAplctPrdOrd }"/>')">승인</button> --%>
+<%-- 													<button type="button" class="btn_type05" onclick="updateEduAplctOrd('30', '<c:out value="${list.eduAplctOrd }" />', '<c:out value="${info.prcsAplctPrdOrd }"/>')">반려</button> --%>
+<%-- 												</c:when> --%>
+<%-- 												<c:otherwise> --%>
+<%-- 													<button type="button" class="btn_type05" onclick="fnCnclPopup('<c:out value="${list.eduAplctOrd }" />', '<c:out value="${info.prcsAplctPrdOrd }"/>')">취소요청</button> --%>
+<%-- 												</c:otherwise> --%>
+<%-- 											</c:choose> --%>
 										</td>
 								</c:forEach>
 							</c:when>
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 316d44e8..6a42e2e4 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
@@ -99,28 +99,28 @@
 		}
 	}
 
-	function fncCancleSubmit(){
-		if(confirm("교육신청 취소하시겠습니까?")){
-			$.ajax({
-				type:"POST",
-				url:"${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctStatusAjax.do",
-				data: {
-					"eduAplctOrd" : $("#eduAplctOrd").val() ,
-					"useYn" : 'N'
-				},
-				dataType:'json',
-				success:function(returnData){
-					if(returnData.rsCnt > 0){
-						alert("교육신청 취소되었습니다.");
-						fncGoList();
-					}
-				},
-				error:function(request , status, error){
-					alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
-				}
-			});
-		}
-	}
+// 	function fncCancleSubmit(){
+// 		if(confirm("교육신청 취소하시겠습니까?")){
+// 			$.ajax({
+// 				type:"POST",
+// 				url:"${pageContext.request.contextPath}/web/ve/aplct/adultVisitEdu/eduAplct/eduAplctStatusAjax.do",
+// 				data: {
+// 					"eduAplctOrd" : $("#eduAplctOrd").val() ,
+// 					"useYn" : 'N'
+// 				},
+// 				dataType:'json',
+// 				success:function(returnData){
+// 					if(returnData.rsCnt > 0){
+// 						alert("교육신청 취소되었습니다.");
+// 						fncGoList();
+// 					}
+// 				},
+// 				error:function(request , status, error){
+// 					alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+// 				}
+// 			});
+// 		}
+// 	}
 
 
 	// 대상자 이름, 생년월일, 대상자TB ID