From 514445f0965b10407c8b580c6800c8b79d89be2d Mon Sep 17 00:00:00 2001 From: hylee Date: Thu, 29 Sep 2022 12:51:47 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=EC=B2=B4=ED=97=98=ED=95=98=EA=B8=B0?= =?UTF-8?q?=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20html=20=ED=99=94=EB=A9=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcc/kccadr/adjst/service/AdjstReqVO.java | 10 ++ .../adjstExp/web/AdjstExpController.java | 13 ++ .../web/AdjstExpDetailController.java | 2 + .../let/uat/uia/web/EgovLoginController.java | 1 + .../jsp/web/kccadr/adjstExp/SsoLoginUsr.jsp | 121 ++++++++++++++++++ .../web/kccadr/adjstExp/adjstIncidentList.jsp | 53 +------- .../jsp/web/kccadr/adjstExp/mainExpPage.jsp | 33 ++--- .../adjstExpDetail/adjstReqStatusDetail.jsp | 4 +- 8 files changed, 173 insertions(+), 64 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/SsoLoginUsr.jsp diff --git a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java index 93afadfe..43d31309 100644 --- a/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java +++ b/src/main/java/kcc/kccadr/adjst/service/AdjstReqVO.java @@ -170,6 +170,10 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable { private String exmpTit; private String exmpCcTy; private String codeId; + private String loginNextUrl; + + + public String getSrchYear() { return srchYear; } @@ -871,6 +875,12 @@ public class AdjstReqVO extends ComDefaultVO implements Serializable { public void setCodeId(String codeId) { this.codeId = codeId; } + public String getLoginNextUrl() { + return loginNextUrl; + } + public void setLoginNextUrl(String loginNextUrl) { + this.loginNextUrl = loginNextUrl; + } } diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java index 2fa856f4..19881484 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpController.java @@ -101,6 +101,19 @@ public class AdjstExpController { private static final Logger LOGGER = LoggerFactory.getLogger(AdjstExpController.class); + + /** + * 체험하기 로그인 페이지 + */ + @RequestMapping("/web/kccadr/adjstExp/SsoLoginUsr.do") + public String SsoLoginUsr(@ModelAttribute("adjstReqVO") AdjstReqVO adjstReqVO, HttpServletRequest request, ModelMap model) throws Exception { + + System.out.println("adjstReqVO.getStep() :: " + adjstReqVO.getStep()); + model.addAttribute("loginNextUrl", adjstReqVO.getLoginNextUrl()); + model.addAttribute("step", adjstReqVO.getStep()); + return "/web/kccadr/adjstExp/SsoLoginUsr"; + + } /** * 체험하기 메인페이지 diff --git a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java index ea7ff1db..1175ec21 100644 --- a/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java +++ b/src/main/java/kcc/kccadr/adjstExp/web/AdjstExpDetailController.java @@ -137,6 +137,8 @@ public class AdjstExpDetailController { */ String step = request.getParameter("step"); + System.out.println("step :: "+ step); + return "/web/kccadr/adjstExpDetail/adjstReqStatusTabDetail"; } /** 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 b36af6b7..7ef1c5d8 100644 --- a/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/kcc/let/uat/uia/web/EgovLoginController.java @@ -335,6 +335,7 @@ public class EgovLoginController { model.addAttribute("beforeUrl", beforeUrl); model.addAttribute("message", message); + // initRsa(request); if (test != null && test.equals("test")) { return "web/kccadr/login/SsoLoginUsr3"; diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/SsoLoginUsr.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/SsoLoginUsr.jsp new file mode 100644 index 00000000..6a84f761 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/SsoLoginUsr.jsp @@ -0,0 +1,121 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="kc" uri="/WEB-INF/tlds/kcc_tld.tld"%> + + + + + + + + + + + + + + + + + +<%--
+ + +
--%> diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp index 45e13a58..5d952cc3 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/adjstIncidentList.jsp @@ -43,7 +43,8 @@ function linkPage(pageNo){ var listForm = document.listForm ; listForm.pageIndex.value = pageNo ; - listForm.action = ""; +// listForm.action = ""; + listForm.action = ""; listForm.submit(); } @@ -103,6 +104,8 @@ " /> " /> " /> + + @@ -123,53 +126,7 @@ -
- <%-- - - -
-
- - -
- ~ -
- - -
- -
-
- - -
-
- - -
- - - --%> -
+
diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp index 4ca0761b..01cf37bb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExp/mainExpPage.jsp @@ -91,18 +91,20 @@ function fn_egov_inqire_notice(bbsId, nttId) { function goExpPage(num) { + var frm = document.dtlFrm; - var actionUrl = ""; - frm.step.value = num + var actionUrl = ""; if(num==1){//접수페이지 - actionUrl = ""; + goUrl = ""; } else{ - actionUrl = "" + goUrl = "" } + frm.loginNextUrl.value = goUrl; + frm.step.value = num; frm.action = actionUrl; frm.submit(); @@ -189,8 +191,8 @@ function goExpPage(num) {
- -

접수

+ +

조정신청

@@ -205,8 +207,8 @@ function goExpPage(num) {
- -

기일지정

+ +

서류제출

@@ -221,8 +223,8 @@ function goExpPage(num) {
- -

기일개최

+ +

진행상황

@@ -237,8 +239,8 @@ function goExpPage(num) {
- -

조정중

+ +

열람·발급

@@ -253,8 +255,8 @@ function goExpPage(num) {
- -

종료

+ +

문의게시판

@@ -386,6 +388,7 @@ function goExpPage(num) {
- + +
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp index 3321f65e..b6b03049 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kccadr/adjstExpDetail/adjstReqStatusDetail.jsp @@ -16,6 +16,7 @@ $("#tabNav > button").on("click" , function(e){ tabPageLoad($(this).index()); }); + console.log('${step}'); tabPageLoad(0); }); @@ -30,7 +31,8 @@ } , function(res, status, xhr){ console.log(status); - $(".step0"+${step}).addClass("active"); +// console.log(${step}); + $(".step0"+'${step}').addClass("active"); }); } function getPageUrl(idx){