From 629bef9bceab18cf9aaa4d2d6c1ade78bba8e5c1 Mon Sep 17 00:00:00 2001
From: myname <antelope337@gmail.com>
Date: Fri, 23 Feb 2024 14:50:45 +0900
Subject: [PATCH] =?UTF-8?q?2024-02-23=2014:50=20=EA=B2=80=EC=B0=B0?=
 =?UTF-8?q?=EC=B2=AD=20=EB=8B=B4=EB=8B=B9=EC=9E=90=20=EC=B4=88=EA=B8=B0=20?=
 =?UTF-8?q?=EB=A9=94=EB=89=B4=20=EC=95=8C=EB=A6=BC=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/uat/uia/web/EgovLoginController.java  |  4 +-
 .../impl/EduAplctAdultServiceImpl.java        |  3 +-
 .../web/EduCnfrmMngTngrController.java        |  3 +
 .../webapp/WEB-INF/jsp/main/EgovMainList.jsp  | 63 +++++++++++++++++--
 .../tngrVisitEdu/eduAplct/eduAplctReg.jsp     |  2 +-
 5 files changed, 67 insertions(+), 8 deletions(-)

diff --git a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java
index 42993183..ccfe4150 100644
--- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java
+++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java
@@ -50,7 +50,6 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
-import com.bandi.oauth.BandiSSOAgent;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
@@ -1699,7 +1698,8 @@ public class EgovLoginController {
         } else if ("ROLE_VISIT".equals(user.getAuthority())) {
         	return "redirect:/cmm/main/mainPage.do";
         } else if ("ROLE_ADR_JRSDC".equals(user.getAuthority())) {
-        	return "redirect:/kccadr/oprtn/cndtnSspnIdtmt/trgtList.do";
+        	//return "redirect:/kccadr/oprtn/cndtnSspnIdtmt/trgtList.do";
+        	return "redirect:/cmm/main/mainPage.do";
         } else if ("ROLE_USER_MEMBER".equals(user.getAuthority())) {
         	System.out.println("비정상적인 사용자    redirect 임");
         	return "redirect:/web/main/mainPage.do";        	
diff --git a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java
index 77e1cb82..ed72e054 100644
--- a/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java
+++ b/src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java
@@ -190,7 +190,8 @@ public class EduAplctAdultServiceImpl implements EduAplctAdultService {
         	notifyManageVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd());
 	    	
 	        //new 알림-2024.02.02
-	        notifyManageService.insertNotifyNew(notifyManageVO, VeConstants.NOTI_STATUS_10);	//교육신청 - 상태변경
+        	//교육신청시 알림 제거 - 2024.02.23
+	        //notifyManageService.insertNotifyNew(notifyManageVO, VeConstants.NOTI_STATUS_10);	//교육신청 - 상태변경
 	        
 		}catch(Exception ex){
 			ex.printStackTrace();
diff --git a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/EduCnfrmMngTngrController.java b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/EduCnfrmMngTngrController.java
index 9be6efc0..e0bec6ec 100644
--- a/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/EduCnfrmMngTngrController.java
+++ b/src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/EduCnfrmMngTngrController.java
@@ -625,12 +625,15 @@ public class EduCnfrmMngTngrController {
 					
 					vEEduChasiInstrAsgnmService.insertDeadLineDt(vo);
 					
+					/*
+					 * 강의수락요청은 알림 제거
 					notifyManageService.insertNotifyAsgnmCnfrmForInstr(
 							loginVO
 							, vo.getEduAplctOrd()
 							, vo.getEduChasiOrd()
 							, vo.getAsgnmAprvlCd()
 							);
+							*/					
 					
 				}
 			}
diff --git a/src/main/webapp/WEB-INF/jsp/main/EgovMainList.jsp b/src/main/webapp/WEB-INF/jsp/main/EgovMainList.jsp
index 7a7c8e73..934ff10a 100644
--- a/src/main/webapp/WEB-INF/jsp/main/EgovMainList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/main/EgovMainList.jsp
@@ -17,6 +17,7 @@
 <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %>
 <%@ taglib prefix="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %>
 <%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>  
 <html>
@@ -42,14 +43,59 @@ function fn_goDetail(cmmNotifyOrd){
 	form.action = "<c:url value='/cmm/main/mainDetail.do'/>";
 	form.submit();
 }
+
+//체크박스 전체 선택
+function chkAll(thisObj){
+	$("input[name=chk]").prop("checked" , $(thisObj).is(":checked"));
+}
+
+function chkDelete(){
+	var chkLen = $(listForm).find("input[name=chk]:checked").length;
+	if(chkLen == 0){
+		alert("선택된 항목이 없습니다.");
+		return;
+	}
+	
+	if(confirm("삭제하시겠습니까?")){
+		var data = new FormData(document.getElementById("listForm"));
+		var url = "<c:url value='/web/my/myNotifyMngDeleteAjax.do'/>"
+		$.ajax({
+			type : "Post",
+			url : url,
+			data : data,
+			dataType : 'json',
+			async : false,
+			processData : false,
+			contentType : false,
+			cache : false,
+			success : function(returnData){
+				if(returnData.result == "success"){
+					alert("삭제되었습니다.");
+					location.reload();
+				}else{
+					alert("실패하였습니다.")
+				}
+			},
+			error : function(request, status, error){
+				alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);	
+			}
+			
+		})
+	}
+		
+	
+}
 </script>
 </head>
 <body>
 	
+	<form:form id="listDelForm" name="listDelForm" commandName="notifyManageVO">
+	</form:form>
+	
 	<form name="detailForm" action="" method="post">
 		<input type="hidden" name="cmmNotifyOrd" id="cmmNotifyOrd" />
 	</form>
-	<form name="listForm" action="<c:url value='/uss/umt/user/EgovUserManage.do'/>" method="post">
+	<form:form id="listForm" name="listForm" action="<c:url value='/uss/umt/user/EgovUserManage.do'/>">
 	    <input name="pageIndex" type="hidden" value="<c:out value='${notifyManageVO.pageIndex}' default='1' /> "/>
 	    <input type="hidden" name="searchSortCnd" value="<c:out value="${notifyManageVO.searchSortCnd}" />" />
 		<input type="hidden" name="searchSortOrd" value="<c:out value="${notifyManageVO.searchSortOrd}" />" />
@@ -100,12 +146,16 @@ function fn_goDetail(cmmNotifyOrd){
 					<div class="tb_type01">
 						<table>
 							<colgroup>
+								<col style="width:3%;">
 								<col style="width: 6%">
 								<col style="width: 15%">
 								<col style="width: 10%">
 							</colgroup>
 							<thead>
 								<tr>
+									<th scope="col"><span class="t_none">삭제 선택</span>
+										<input type="checkbox" name="checkAll" id="checkAll" onclick="chkAll(this);" />
+									</th>
 									<th scope="col">분야</th>
 									<th scope="col">메세지</th>
 									<th scope="col">등록일</th>
@@ -113,7 +163,11 @@ function fn_goDetail(cmmNotifyOrd){
 							</thead>
 							<tbody>
 								<c:forEach var="list" items="${list}" varStatus="status">
+							
 									<tr onclick="fn_goDetail('${list.cmmNotifyOrd}')" style="cursor: pointer;" >
+										<td onclick="event.cancelBubble=true">
+											<input name="chk" id="<c:out value="${list.cmmNotifyOrd}"/>"  type="checkbox" value="<c:out value="${list.cmmNotifyOrd}"/>"/> <label for="<c:out value="${list.cmmNotifyOrd}"/>" class="label">알림 선택</label>
+					                    </td>										
 										<td>
 											<c:if test="${list.notifyChk ne 'Y'}">
 												<span class="new_icon">NEW</span>
@@ -129,7 +183,7 @@ function fn_goDetail(cmmNotifyOrd){
 									</tr>
 								</c:forEach>
 								<c:if test="${empty list}">
-									<tr><td colspan="3"><spring:message code="common.nodata.msg" /></td></tr>
+									<tr><td colspan="4"><spring:message code="common.nodata.msg" /></td></tr>
 								</c:if>
 							</tbody>
 						</table>
@@ -139,6 +193,7 @@ function fn_goDetail(cmmNotifyOrd){
 					<!-- btn_wrap -->
 					<div class="btn_wrap btn_layout01">
 						<div class="area_left">
+							<button type="button" class="btnType01" onclick="chkDelete();" />삭제</button>
 						</div>
 						<div class="area_right">
 <!-- 							<button type="button" class="btnType02" onclick="fn_regBtn(); return false;">등록</button> -->
@@ -153,8 +208,8 @@ function fn_goDetail(cmmNotifyOrd){
 				</div>
 				<!-- //cont -->
 			</div>
-		</div>
-	</form>
+		</div>	
+	</form:form>
 <form name="modiForm" id="modiForm" method="get">
 	<input name="selectedId" type="hidden" />
 </form>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp
index b74f4310..3355b601 100644
--- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp
@@ -485,7 +485,7 @@ function _chkChasiTime(p_this){
 		
 		var url = '${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctRegAjax.do';
 		if(VeConstants.MODE_UPT == $("#mode").val()){
-			url = '${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfyAjax.do';
+			//url = '${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctMdfyAjax.do';
 			url = '${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctRegUpdAjax.do';
 		}