From ee3c6c2fb6069c6d9c7a0df7bae13734708890f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= Date: Fri, 27 Jan 2023 11:18:24 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?= =?UTF-8?q?=EC=96=91=EC=8B=9D=20=EC=88=98=EC=A0=95.=20=20-=20=EC=9D=B8?= =?UTF-8?q?=EC=82=AC=EC=8B=9C=EC=8A=A4=ED=85=9C=20=EC=97=B0=EB=8F=99?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=88=98=EC=A0=95=EB=B6=88=EA=B0=80?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD.=20=20-=20=EC=A7=81=EB=B3=84=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EA=B2=BD=EA=B3=BC=20=EC=BD=94=EB=93=9C?= =?UTF-8?q?=EC=99=80=20=EC=97=B0=EB=8F=99=EB=90=98=EB=8F=84=EB=A1=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/dbnt/faisp/kwms/KwmsController.java | 43 +++--- .../mybatisMapper/UserInfoMapper.xml | 2 +- src/main/resources/static/js/login/login.js | 134 ++++++++++-------- .../resources/templates/login/joinForm.html | 36 ++--- src/main/resources/templates/login/login.html | 17 +-- 5 files changed, 120 insertions(+), 112 deletions(-) diff --git a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java index a57e0ac8..d0924bd5 100644 --- a/src/main/java/com/dbnt/faisp/kwms/KwmsController.java +++ b/src/main/java/com/dbnt/faisp/kwms/KwmsController.java @@ -5,6 +5,7 @@ import com.dbnt.faisp.kwms.service.KwmsService; import com.dbnt.faisp.main.codeMgt.service.CodeMgtService; import com.dbnt.faisp.main.userInfo.model.UserInfo; import com.dbnt.faisp.main.userInfo.service.UserInfoService; +import com.dbnt.faisp.util.Utils; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; @@ -23,26 +24,32 @@ public class KwmsController { @GetMapping("/getEmpInfoToJoinForm") public ModelAndView getEmpInfo(VEmployee empInfo){ ModelAndView mav = new ModelAndView("login/joinForm"); - if(userInfoService.selectUserInfoToDicCode(empInfo.getDic()) == null){ - UserInfo userInfo = kwmsService.selectEmpInfo(empInfo.getDic()); - if(userInfo==null){ - mav.addObject("joinFlag", "F"); - mav.addObject("userInfo", empInfo); - mav.addObject("msg", "검색 결과가 없습니다."); - }else{ - mav.addObject("joinFlag", "T"); - mav.addObject("userInfo", userInfo); - mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); - mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC")); - mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT")); - mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC")); - mav.addObject("seriesList", codeMgtService.selectCodeMgtList("SRC")); - mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG")); - } - }else{ + if(Utils.isEmpty(empInfo.getDic())){ mav.addObject("joinFlag", "F"); mav.addObject("userInfo", empInfo); - mav.addObject("msg", "이미 가입된 식별번호입니다."); + mav.addObject("msg", "-포함 입력 ex) M00-00000"); + }else{ + if(userInfoService.selectUserInfoToDicCode(empInfo.getDic()) == null){ + UserInfo userInfo = kwmsService.selectEmpInfo(empInfo.getDic()); + if(userInfo==null){ + mav.addObject("joinFlag", "F"); + mav.addObject("userInfo", empInfo); + mav.addObject("msg", "검색 결과가 없습니다."); + }else{ + mav.addObject("joinFlag", "T"); + mav.addObject("userInfo", userInfo); + mav.addObject("ogList", codeMgtService.selectCodeMgtList("OG")); + mav.addObject("ofcList", codeMgtService.selectCodeMgtList("OFC")); + mav.addObject("titleList", codeMgtService.selectCodeMgtList("JT")); + mav.addObject("outturnList", codeMgtService.selectCodeMgtList("OTC")); + mav.addObject("seriesList", codeMgtService.selectCodeMgtList(userInfo.getOutturnCd())); + mav.addObject("languageList", codeMgtService.selectCodeMgtList("LNG")); + } + }else{ + mav.addObject("joinFlag", "F"); + mav.addObject("userInfo", empInfo); + mav.addObject("msg", "이미 가입된 식별번호입니다."); + } } return mav; } diff --git a/src/main/resources/mybatisMapper/UserInfoMapper.xml b/src/main/resources/mybatisMapper/UserInfoMapper.xml index d2ad3d97..e9879587 100644 --- a/src/main/resources/mybatisMapper/UserInfoMapper.xml +++ b/src/main/resources/mybatisMapper/UserInfoMapper.xml @@ -11,7 +11,7 @@ user_status = #{userStatus} - user_status != 'D' + user_status = 'USC003' diff --git a/src/main/resources/static/js/login/login.js b/src/main/resources/static/js/login/login.js index 56ea2c53..6c008bf6 100644 --- a/src/main/resources/static/js/login/login.js +++ b/src/main/resources/static/js/login/login.js @@ -1,23 +1,12 @@ +$(document).on('click', '#joinModalBtn', function (){ + getJoinForm(null); + $("#userInsertModal").modal('show') +}) + $(document).on('click', '#dicCodeSearchBtn', function (){ const dicCode = $("#dicCode").val(); if(dicCode!==''){ - $.ajax({ - url: '/kwms/getEmpInfoToJoinForm', - data: {dic: dicCode}, - type: 'GET', - dataType:"html", - success: function(html){ - $("#userInsertModalContent").empty().append(html) - $(".dateSelector").datepicker({ - format: "yyyy-mm-dd", - language: "ko", - autoclose: true - }); - }, - error:function(e){ - - } - }); + getJoinForm(dicCode); }else{ alert("공무원식별번호를 입력해주세요.") } @@ -27,7 +16,9 @@ $(document).on('click', '#saveBtn', function (){ if(valueCheck()){ if(confirm("저장하시겠습니까?")){ contentFade("in"); - const formData = new FormData($("#userInfoInsert")[0]); + const userForm = $("#userInfoInsert") + userForm.find('input, select').removeAttr('disabled') + const formData = new FormData(userForm[0]); $.ajax({ type : 'POST', data : formData, @@ -40,7 +31,6 @@ $(document).on('click', '#saveBtn', function (){ }else{ alert("저장되었습니다.\n담당자 승인 후 로그인 가능합니다.") $("#closeModalBtn").click(); - $("#searchBtn").click(); } contentFade("out"); }, @@ -53,19 +43,30 @@ $(document).on('click', '#saveBtn', function (){ } }) +function getJoinForm(dicCode){ + $.ajax({ + url: '/kwms/getEmpInfoToJoinForm', + data: {dic: dicCode}, + type: 'GET', + dataType:"html", + success: function(html){ + $("#userInsertModalContent").empty().append(html) + $(".dateSelector").datepicker({ + format: "yyyy-mm-dd", + language: "ko", + autoclose: true + }); + }, + error:function(e){ + + } + }); +} + function valueCheck(){ const targetForm = $("#userInfoInsert"); - const userId = targetForm.find("#userId").val(); - const password = targetForm.find("#modalPassword"); - const passwordConfirm = targetForm.find("#passwordConfirm"); - const userNm = targetForm.find("#userNm").val(); - const phoneNo = targetForm.find("#phoneNo").val(); - const email = targetForm.find("#email").val(); - const ogCd = targetForm.find("#ogCd").val(); - const titleCd = targetForm.find("#titleCd").val(); - let returnFlag = true; - if(!userId){ + /*if(!userId){ alert("아이디를 입력해주세요."); returnFlag = false; }else{ @@ -74,48 +75,57 @@ function valueCheck(){ returnFlag = false; alert("아이디 조건이 맞지 않습니다.") } - } + }*/ + const password = targetForm.find("#modalPassword"); + const passwordConfirm = targetForm.find("#passwordConfirm"); if(!password[0].disabled && !password.val()){ alert("비밀번호를 입력해주세요."); - returnFlag = false; + return false; } if(!password[0].disabled && !passwordConfirm.val()){ alert("비밀번호 확인을 입력해주세요."); - returnFlag = false; + return false; } - if(!userNm){ - alert("이름을 입력해주세요."); - returnFlag = false; - } - if(!phoneNo){ - alert("휴대전화를 입력해주세요."); - returnFlag = false; - } - if(!email){ - alert("이메일을 입력해주세요."); - returnFlag = false; - } - if(returnFlag){ - const passwordReg = /^(?=.*[a-zA-z])(?=.*[0-9])(?=.*[$`~!@$!%*#^?&\\(\\)\-_=+]).{8,16}$/; - if(!password[0].disabled){ - if(!passwordReg.test(password.val())){ - alert("비밀번호 조건이 맞지 않습니다.") - returnFlag = false; - }else{ - if(password.val() !== passwordConfirm.val()){ - alert("비밀번호가 같지 않습니다."); - returnFlag = false; - } + const passwordReg = /^(?=.*[a-zA-z])(?=.*[0-9])(?=.*[$`~!@$!%*#^?&\\(\\)\-_=+]).{8,16}$/; + if(!password[0].disabled){ + if(!passwordReg.test(password.val())){ + alert("비밀번호 조건이 맞지 않습니다.") + return false; + }else{ + if(password.val() !== passwordConfirm.val()){ + alert("비밀번호가 같지 않습니다."); + return false; } } } - if(!ogCd){ - alert("관서를 선택해주세요."); - returnFlag = false; + const phoneNo = targetForm.find("#phoneNo").val(); + if(!phoneNo){ + alert("휴대전화를 입력해주세요."); + return false; + }else{ + const phoneReg = /^(\d{10,11}|\d{3}-\d{3,4}-\d{4})$/; + if(!phoneReg.test(phoneNo)){ + alert("휴대전화 입력 양식에 맞지 않습니다.") + return false; + } } - if(!titleCd){ - alert("계급을 선택해주세요."); - returnFlag = false; + const email = targetForm.find("#email").val(); + if(!email){ + alert("이메일을 입력해주세요."); + return false; } - return returnFlag; + const organInDate = targetForm.find("#organInDate").val(); + if(!organInDate){ + alert("현관서전입일을 입력해주세요."); + return false; + } + const seriesCd = targetForm.find("#seriesCd").val(); + if(!seriesCd){ + alert("직별을 선택해주세요."); + return false; + } + + + + return true; } \ No newline at end of file diff --git a/src/main/resources/templates/login/joinForm.html b/src/main/resources/templates/login/joinForm.html index 16326ce0..ebcd9e39 100644 --- a/src/main/resources/templates/login/joinForm.html +++ b/src/main/resources/templates/login/joinForm.html @@ -7,7 +7,7 @@
- +
@@ -17,22 +17,22 @@
-
- +
+
- +
- +
- - + +
- +
@@ -50,16 +50,18 @@
+
+
- @@ -68,17 +70,17 @@
- +
- +
- @@ -93,7 +95,7 @@
- @@ -102,13 +104,13 @@
- +
- @@ -117,13 +119,13 @@
- +
- diff --git a/src/main/resources/templates/login/login.html b/src/main/resources/templates/login/login.html index b2898f6d..0e92b666 100644 --- a/src/main/resources/templates/login/login.html +++ b/src/main/resources/templates/login/login.html @@ -43,7 +43,8 @@
- 회원가입 + + 회원가입
@@ -58,19 +59,7 @@ aria-labelledby="userInsertModalLabel" aria-hidden="true">
-
-
사용자 신청
- -
-
-
- -
- -
- -
-
+