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"%> @@ -42,14 +43,59 @@ function fn_goDetail(cmmNotifyOrd){ form.action = ""; 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 = "" + $.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); + } + + }) + } + + +} + + +
-
+ " /> " /> @@ -100,12 +146,16 @@ function fn_goDetail(cmmNotifyOrd){
+ + @@ -113,7 +163,11 @@ function fn_goDetail(cmmNotifyOrd){ + + - +
삭제 선택 + + 분야 메세지 등록일
+ " type="checkbox" value=""/> + NEW @@ -129,7 +183,7 @@ function fn_goDetail(cmmNotifyOrd){
@@ -139,6 +193,7 @@ function fn_goDetail(cmmNotifyOrd){
+
@@ -153,8 +208,8 @@ function fn_goDetail(cmmNotifyOrd){
-
- + +
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'; }