From e0fb1bc8c1e8ff4b07b014dd9f3db4ac84286d1d Mon Sep 17 00:00:00 2001 From: HappyITN Date: Thu, 17 Nov 2022 17:40:13 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EC=A1=B0=EC=83=81=ED=9D=AC=20=EB=A0=88?= =?UTF-8?q?=EB=93=9C=EB=A7=88=EC=9D=B8=20#2894?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 관리자 에문 신청취지 팝업 작업 --- .../apm/popup/adjstReqOpenExamplePop.jsp | 192 +++++++++--------- src/main/webapp/kccadrPb/adm/css/content.css | 16 -- 2 files changed, 100 insertions(+), 108 deletions(-) diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp index 3baa1098..dc00cebb 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp @@ -30,104 +30,112 @@ + - -
-
-

- - - - - - - - - - - - - - - - -
- -
-
-
+ diff --git a/src/main/webapp/kccadrPb/adm/css/content.css b/src/main/webapp/kccadrPb/adm/css/content.css index d01905d8..ac330308 100644 --- a/src/main/webapp/kccadrPb/adm/css/content.css +++ b/src/main/webapp/kccadrPb/adm/css/content.css @@ -488,19 +488,3 @@ table select+button{vertical-align: middle;} .tbType01 tbody td .innorix_basic {margin:15px 0;} - - - - - - - - - - - - - - - - From 6f6bce32c396796a7c137d3f75a8874e801821f6 Mon Sep 17 00:00:00 2001 From: hylee Date: Mon, 21 Nov 2022 09:51:10 +0900 Subject: [PATCH 2/2] =?UTF-8?q?refactor:=EC=98=88=EB=AC=B8=20=ED=8C=9D?= =?UTF-8?q?=EC=97=85=20jstl=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../adjPgrMgr/apm/web/ApmController.java | 2 ++ .../apm/popup/adjstReqOpenExamplePop.jsp | 31 +++++++------------ 2 files changed, 13 insertions(+), 20 deletions(-) diff --git a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java index 2835bbdf..7604f655 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -19,6 +19,7 @@ import org.json.simple.JSONObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; +import org.springframework.core.env.SystemEnvironmentPropertySource; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; @@ -659,6 +660,7 @@ public class ApmController { // List fileList = fileService.selectFileInfs(fileVO); // model.addAttribute("fileList", fileList); // } + model.addAttribute("exmpList", exmp); model.addAttribute("ccTy", adjstReqVO.getCcTy()); model.addAttribute("exmpCd", adjstReqVO.getExmpCd()); diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp index dc00cebb..a306af41 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/adjstReqOpenExamplePop.jsp @@ -114,28 +114,19 @@ function workView(obj){