From 928cf2c45f874ae853b616c1567eb9eac6f48527 Mon Sep 17 00:00:00 2001 From: jiwoo Date: Tue, 17 Oct 2023 12:39:30 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=EC=A0=80?= =?UTF-8?q?=EC=9E=91=EA=B6=8C=20=EC=B2=B4=ED=97=98=EA=B5=90=EC=8B=A4=20?= =?UTF-8?q?=EB=8C=80=EC=8B=9C=EB=B3=B4=EB=93=9C=20=EC=9A=B4=EC=98=81?= =?UTF-8?q?=EA=B3=84=ED=9A=8D/=EC=84=9C=EB=A5=98=EC=A0=9C=EC=B6=9C=20?= =?UTF-8?q?=EC=88=9C=EC=84=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exprnClsrmAplct/web/ExprnClsrmAplctController.java | 6 +++--- .../jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp | 2 +- .../cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp | 2 +- .../exprnClsrmInfo/exprnClsrmAplctDashboard.jsp | 4 ++-- .../cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp | 2 +- .../exprnClsrmInfo/exprnDocumentDashboard.jsp | 2 +- .../cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp | 2 +- .../cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java index ef4e1cdb..b4d2b784 100644 --- a/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java +++ b/src/main/java/kcc/ve/aplct/cpyrgExprnClsrm/exprnClsrmAplct/web/ExprnClsrmAplctController.java @@ -530,9 +530,7 @@ public class ExprnClsrmAplctController { } if("1".equals(Type)) { //type1 - 신청정보 return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard"; - }else if("2".equals(Type)) { //type2 - 운영계획 - return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard"; - }else if("3".equals(Type)) { //type3 - 거래선 + }else if("2".equals(Type)) { //type2 - 서류제출 //거래선 파일 정보 가져오기 FileVO fileVO = new FileVO(); fileVO.setAtchFileId(vEEduAplctVO.getTransAtchFileId()); @@ -552,6 +550,8 @@ public class ExprnClsrmAplctController { model.addAttribute("planFileList", result); model.addAttribute("planFileListCnt", result.size()); return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard"; + }else if("3".equals(Type)) { //type3 - 운영계획 + return "/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard"; }else if("4".equals(Type)) { //type4 - 결과보고 FileVO fileVO = new FileVO(); if(vEEduAplctVO.getOrgnlRsltAtchFileId() != null){ diff --git a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp index 5a5b8d32..4e96ee7e 100644 --- a/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/oprtn/cpyrgExprnClsrm/oprtnAplctMngDetail.jsp @@ -422,7 +422,7 @@ <%-- --%> - + <%-- --%>
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp index 367242fc..a6aa7542 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnAplctDashboard.jsp @@ -276,7 +276,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp index ebff8aa3..5bf8d691 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctDashboard.jsp @@ -68,8 +68,8 @@ diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp index 263e475d..9f4a3729 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnClsrmAplctGuide.jsp @@ -20,7 +20,7 @@ function openPop(){ //if(!checkAplctPsbl()) return; if(${detailVO == null}){ - alert("등록된 운영신청 안내가 없습니다."); + alert("신청기간이 아닙니다."); return false; } commonPopLayeropen( diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp index f332ff97..89517439 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnDocumentDashboard.jsp @@ -124,7 +124,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp index 33e05358..d260d1fb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnPlanDashboard.jsp @@ -179,7 +179,7 @@
- +
diff --git a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp index cc54683d..9abf8149 100644 --- a/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/ve/aplct/cpyrgExprnClsrm/exprnClsrmInfo/exprnRsltDashboard.jsp @@ -705,7 +705,7 @@
- +