tolag3/koipa_edu_2025-1
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2024-02-23 14:50 검찰청 담당자 초기 메뉴 알림으로 변경

Browse Source
This commit is contained in:
myname 2024-02-23 14:50:45 +09:00
parent 0634656e46
commit 629bef9bce
5 changed files with 67 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/kcc/let/uat/uia/web/EgovLoginController.java
View File

@ -50,7 +50,6 @@ import org.springframework.web.context.support.WebApplicationContextUtils;
import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.ModelAndView;
import org.springframework.web.servlet.mvc.support.RedirectAttributes; import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.bandi.oauth.BandiSSOAgent;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
@ -1699,7 +1698,8 @@ public class EgovLoginController {
} else if ("ROLE_VISIT".equals(user.getAuthority())) { } else if ("ROLE_VISIT".equals(user.getAuthority())) {
return "redirect:/cmm/main/mainPage.do"; return "redirect:/cmm/main/mainPage.do";
} else if ("ROLE_ADR_JRSDC".equals(user.getAuthority())) { } 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())) { } else if ("ROLE_USER_MEMBER".equals(user.getAuthority())) {
System.out.println("비정상적인 사용자 redirect 임"); System.out.println("비정상적인 사용자 redirect 임");
return "redirect:/web/main/mainPage.do"; return "redirect:/web/main/mainPage.do";

3
src/main/java/kcc/ve/aplct/adultVisitEdu/eduAplct/service/impl/EduAplctAdultServiceImpl.java
View File

@ -190,7 +190,8 @@ public class EduAplctAdultServiceImpl implements EduAplctAdultService {
notifyManageVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd()); notifyManageVO.setEduAplctOrd(vEEduAplctVO.getEduAplctOrd());
//new 알림-2024.02.02 //new 알림-2024.02.02
notifyManageService.insertNotifyNew(notifyManageVO, VeConstants.NOTI_STATUS_10); //교육신청 - 상태변경 //교육신청시 알림 제거 - 2024.02.23
//notifyManageService.insertNotifyNew(notifyManageVO, VeConstants.NOTI_STATUS_10); //교육신청 - 상태변경
}catch(Exception ex){ }catch(Exception ex){
ex.printStackTrace(); ex.printStackTrace();

3
src/main/java/kcc/ve/oprtn/tngrVisitEdu/eduCnfrmMng/web/EduCnfrmMngTngrController.java
View File

@ -625,12 +625,15 @@ public class EduCnfrmMngTngrController {
vEEduChasiInstrAsgnmService.insertDeadLineDt(vo); vEEduChasiInstrAsgnmService.insertDeadLineDt(vo);
/*
* 강의수락요청은 알림 제거
notifyManageService.insertNotifyAsgnmCnfrmForInstr( notifyManageService.insertNotifyAsgnmCnfrmForInstr(
loginVO loginVO
, vo.getEduAplctOrd() , vo.getEduAplctOrd()
, vo.getEduChasiOrd() , vo.getEduChasiOrd()
, vo.getAsgnmAprvlCd() , vo.getAsgnmAprvlCd()
); );
*/
} }
} }

63
src/main/webapp/WEB-INF/jsp/main/EgovMainList.jsp
View File

@ -17,6 +17,7 @@
<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ 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="double-submit" uri="http://www.egovframe.go.kr/tags/double-submit/jsp" %>
<%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%> <%@ taglib prefix="ve" uri="/WEB-INF/tlds/kcc_tld.tld"%>
<html> <html>
@ -42,14 +43,59 @@ function fn_goDetail(cmmNotifyOrd){
form.action = "<c:url value='/cmm/main/mainDetail.do'/>"; form.action = "<c:url value='/cmm/main/mainDetail.do'/>";
form.submit(); 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> </script>
</head> </head>
<body> <body>
<form:form id="listDelForm" name="listDelForm" commandName="notifyManageVO">
</form:form>
<form name="detailForm" action="" method="post"> <form name="detailForm" action="" method="post">
<input type="hidden" name="cmmNotifyOrd" id="cmmNotifyOrd" /> <input type="hidden" name="cmmNotifyOrd" id="cmmNotifyOrd" />
</form> </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 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="searchSortCnd" value="<c:out value="${notifyManageVO.searchSortCnd}" />" />
<input type="hidden" name="searchSortOrd" value="<c:out value="${notifyManageVO.searchSortOrd}" />" /> <input type="hidden" name="searchSortOrd" value="<c:out value="${notifyManageVO.searchSortOrd}" />" />
@ -100,12 +146,16 @@ function fn_goDetail(cmmNotifyOrd){
<div class="tb_type01"> <div class="tb_type01">
<table> <table>
<colgroup> <colgroup>
<col style="width:3%;">
<col style="width: 6%"> <col style="width: 6%">
<col style="width: 15%"> <col style="width: 15%">
<col style="width: 10%"> <col style="width: 10%">
</colgroup> </colgroup>
<thead> <thead>
<tr> <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> <th scope="col">메세지</th>
<th scope="col">등록일</th> <th scope="col">등록일</th>
@ -113,7 +163,11 @@ function fn_goDetail(cmmNotifyOrd){
</thead> </thead>
<tbody> <tbody>
<c:forEach var="list" items="${list}" varStatus="status"> <c:forEach var="list" items="${list}" varStatus="status">
<tr onclick="fn_goDetail('${list.cmmNotifyOrd}')" style="cursor: pointer;" > <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> <td>
<c:if test="${list.notifyChk ne 'Y'}"> <c:if test="${list.notifyChk ne 'Y'}">
<span class="new_icon">NEW</span> <span class="new_icon">NEW</span>
@ -129,7 +183,7 @@ function fn_goDetail(cmmNotifyOrd){
</tr> </tr>
</c:forEach> </c:forEach>
<c:if test="${empty list}"> <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> </c:if>
</tbody> </tbody>
</table> </table>
@ -139,6 +193,7 @@ function fn_goDetail(cmmNotifyOrd){
<!-- btn_wrap --> <!-- btn_wrap -->
<div class="btn_wrap btn_layout01"> <div class="btn_wrap btn_layout01">
<div class="area_left"> <div class="area_left">
<button type="button" class="btnType01" onclick="chkDelete();" />삭제</button>
</div> </div>
<div class="area_right"> <div class="area_right">
<!-- <button type="button" class="btnType02" onclick="fn_regBtn(); return false;">등록</button> --> <!-- <button type="button" class="btnType02" onclick="fn_regBtn(); return false;">등록</button> -->
@ -153,8 +208,8 @@ function fn_goDetail(cmmNotifyOrd){
</div> </div>
<!-- //cont --> <!-- //cont -->
</div> </div>
</div> </div>
</form> </form:form>
<form name="modiForm" id="modiForm" method="get"> <form name="modiForm" id="modiForm" method="get">
<input name="selectedId" type="hidden" /> <input name="selectedId" type="hidden" />
</form> </form>

2
src/main/webapp/WEB-INF/jsp/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctReg.jsp
View File

@ -485,7 +485,7 @@ function _chkChasiTime(p_this){
var url = '${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctRegAjax.do'; var url = '${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctRegAjax.do';
if(VeConstants.MODE_UPT == $("#mode").val()){ 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'; url = '${pageContext.request.contextPath}/web/ve/aplct/tngrVisitEdu/eduAplct/eduAplctRegUpdAjax.do';
} }