From 29d05ee5a7c413a373c5cb17d6613822102c6d94 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Mon, 29 Aug 2022 13:04:40 +0900 Subject: [PATCH 1/2] =?UTF-8?q?feat:=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85?= =?UTF-8?q?=20=EA=B4=80=EC=84=9C,=EB=B6=80=EC=84=9C=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=EB=9E=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/codeMgt/CodeMgtService.java | 9 +++++++++ .../dbnt/faisp/controller/BaseController.java | 11 +++++++++++ src/main/resources/static/js/login/login.js | 12 +++++++++++- src/main/resources/templates/login/login.html | 18 ++++++++++++++++++ 4 files changed, 49 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java b/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java index 64ae86d2..c086eee8 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java +++ b/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java @@ -43,4 +43,13 @@ public class CodeMgtService{ public List selectCommonCodeList() { return codeMgtRepository.findByUseChkOrderByItemCdAsc("T"); } + +public List selectCodeMgtOgList() { + return codeMgtRepository.findByCategoryCdOrderByItemCdAsc("OG"); +} + +public List selectCodeMgtOfcList() { + return codeMgtRepository.findByCategoryCdOrderByItemCdAsc("OFC"); + +} } diff --git a/src/main/java/com/dbnt/faisp/controller/BaseController.java b/src/main/java/com/dbnt/faisp/controller/BaseController.java index 3abd6e3e..b466ad31 100644 --- a/src/main/java/com/dbnt/faisp/controller/BaseController.java +++ b/src/main/java/com/dbnt/faisp/controller/BaseController.java @@ -2,12 +2,17 @@ package com.dbnt.faisp.controller; import com.dbnt.faisp.userInfo.model.UserInfo; import com.dbnt.faisp.codeMgt.CodeMgtService; +import com.dbnt.faisp.codeMgt.model.CodeCatg; +import com.dbnt.faisp.codeMgt.model.CodeMgt; + import lombok.RequiredArgsConstructor; import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; import org.springframework.web.servlet.ModelAndView; +import java.util.List; + import javax.servlet.http.HttpSession; @RestController @@ -36,6 +41,12 @@ public class BaseController { @GetMapping("/login") public ModelAndView goLogin() { ModelAndView mav = new ModelAndView("/login/login"); + List code = codeMgtService.selectCodeMgtOgList(); + List ccode = codeMgtService.selectCodeMgtOfcList(); + mav.addObject("OgList", codeMgtService.selectCodeMgtOgList()); + mav.addObject("OfcList", codeMgtService.selectCodeMgtOfcList()); + System.out.println("@@"+code); + System.out.println("@@@"+ccode); return mav; } diff --git a/src/main/resources/static/js/login/login.js b/src/main/resources/static/js/login/login.js index 034b9592..ef3982f2 100644 --- a/src/main/resources/static/js/login/login.js +++ b/src/main/resources/static/js/login/login.js @@ -35,7 +35,9 @@ function valueCheck(form){ const userId = targetForm.find("#userId").val(); const password = targetForm.find("#modalPassword"); const passwordConfirm = targetForm.find("#passwordConfirm"); - const userNm = targetForm.find("#userNm").val() + const userNm = targetForm.find("#userNm").val(); + const ogCd = targetForm.find("#ogCd").val(); + const ofcCd = targetForm.find("#ofcCd").val(); let returnFlag = true; if(!userId){ @@ -74,5 +76,13 @@ function valueCheck(form){ } } } + if(!ogCd){ + alert("관서를 선택해주세요."); + returnFlag = false; + } + if(!ofcCd){ + alert("부서를 선택해주세요."); + returnFlag = false; + } return returnFlag; } \ No newline at end of file diff --git a/src/main/resources/templates/login/login.html b/src/main/resources/templates/login/login.html index 91e3e931..2ab67a25 100644 --- a/src/main/resources/templates/login/login.html +++ b/src/main/resources/templates/login/login.html @@ -97,6 +97,24 @@ +
+ +
+ +
+ +
+ +
+
From 094433f9f52e9030e33d85027b8d991d8464eeb9 Mon Sep 17 00:00:00 2001 From: TaehunPark Date: Mon, 29 Aug 2022 13:08:30 +0900 Subject: [PATCH 2/2] =?UTF-8?q?feat:=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85?= =?UTF-8?q?=20=EA=B4=80=EC=84=9C,=EB=B6=80=EC=84=9C=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=EB=9E=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java | 2 +- .../java/com/dbnt/faisp/controller/BaseController.java | 8 +++----- src/main/resources/static/js/login/login.js | 2 +- src/main/resources/templates/login/login.html | 2 +- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java b/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java index c086eee8..fa11f264 100644 --- a/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java +++ b/src/main/java/com/dbnt/faisp/codeMgt/CodeMgtService.java @@ -45,7 +45,7 @@ public class CodeMgtService{ } public List selectCodeMgtOgList() { - return codeMgtRepository.findByCategoryCdOrderByItemCdAsc("OG"); + return codeMgtRepository.findByCategoryCdOrderByItemCdAsc("OG"); } public List selectCodeMgtOfcList() { diff --git a/src/main/java/com/dbnt/faisp/controller/BaseController.java b/src/main/java/com/dbnt/faisp/controller/BaseController.java index b466ad31..ee739642 100644 --- a/src/main/java/com/dbnt/faisp/controller/BaseController.java +++ b/src/main/java/com/dbnt/faisp/controller/BaseController.java @@ -39,20 +39,18 @@ public class BaseController { } @GetMapping("/login") - public ModelAndView goLogin() { + public ModelAndView goLogin() { ModelAndView mav = new ModelAndView("/login/login"); - List code = codeMgtService.selectCodeMgtOgList(); - List ccode = codeMgtService.selectCodeMgtOfcList(); mav.addObject("OgList", codeMgtService.selectCodeMgtOgList()); mav.addObject("OfcList", codeMgtService.selectCodeMgtOfcList()); - System.out.println("@@"+code); - System.out.println("@@@"+ccode); return mav; } @GetMapping("/login-error") public ModelAndView loginError() { ModelAndView mav = new ModelAndView("/login/login"); + mav.addObject("OgList", codeMgtService.selectCodeMgtOgList()); + mav.addObject("OfcList", codeMgtService.selectCodeMgtOfcList()); mav.addObject("loginError", true); return mav; } diff --git a/src/main/resources/static/js/login/login.js b/src/main/resources/static/js/login/login.js index ef3982f2..d6c1350a 100644 --- a/src/main/resources/static/js/login/login.js +++ b/src/main/resources/static/js/login/login.js @@ -71,7 +71,7 @@ function valueCheck(form){ }else{ if(password.val() !== passwordConfirm.val()){ alert("비밀번호가 같지 않습니다."); - returnFlag = false; + returnFlag = false; } } } diff --git a/src/main/resources/templates/login/login.html b/src/main/resources/templates/login/login.html index 2ab67a25..638b445a 100644 --- a/src/main/resources/templates/login/login.html +++ b/src/main/resources/templates/login/login.html @@ -104,7 +104,7 @@ - +