From 3c147fac464c611c870ea77c67ad14bf6f9f0f80 Mon Sep 17 00:00:00 2001 From: itn Date: Tue, 13 Jun 2023 12:14:43 +0900 Subject: [PATCH] =?UTF-8?q?B=EC=84=A0=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/EgovMberManageServiceImpl.java | 7 +++- .../uat/uia/service/impl/MberManageDAO.java | 4 +++ .../let/uat/uia/web/EgovLoginController.java | 28 +++++++++++++++ .../itn/let/uss/umt/service/MberManageVO.java | 16 +++++++++ .../let/uss/umt/EgovUserManage_SQL_Mysql.xml | 13 +++++++ .../WEB-INF/jsp/web/login/usrCheckTerms.jsp | 11 +++--- .../WEB-INF/jsp/web/login/usrInsertView.jsp | 34 ++++++++++++++++++- .../WEB-INF/jsp/web/login/usrSelectDept.jsp | 5 ++- .../webapp/WEB-INF/jsp/web/main/mainPage.jsp | 2 +- 9 files changed, 112 insertions(+), 8 deletions(-) diff --git a/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java b/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java index 9c479ff8..c46e0466 100644 --- a/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java +++ b/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java @@ -236,7 +236,12 @@ public class EgovMberManageServiceImpl extends EgovAbstractServiceImpl implement int resultUsr = mberManageDAO.insertMber(mberManageVO); //강제로 일반사용자 권한 등록(USER회원의 승인처리) ( kerinet : 2018-05-17 ) - // 페스워드 히스토리 등록 + // BlineCode 업데이트 + if (null != mberManageVO.getBlineCode() && !mberManageVO.getBlineCode().equals("N")) { + mberManageDAO.updateUserBlineCode(mberManageVO); + } + + // 패스워드 히스토리 등록 mberManageDAO.insertMberPWLog(mberManageVO); if(resultUsr > 0) { diff --git a/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java b/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java index 40fe5d51..9d4322bb 100644 --- a/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java +++ b/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java @@ -56,6 +56,10 @@ public class MberManageDAO extends EgovComAbstractDAO{ return (int)update("mberManageDAO.insertMber", vo); } + public int updateUserBlineCode(MberManageVO vo) { + return (int)update("mberManageDAO.updateUserBlineCode", vo); + } + // 이메일 발송용 정상회원 전체목록 @SuppressWarnings("unchecked") public List selectEmailSendMberList(UserDefaultVO userSearchVO){ diff --git a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java index 21fe35a4..ff9623f0 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java @@ -241,6 +241,16 @@ public class EgovLoginController { Boolean isAuthenticated = EgovUserDetailsHelper.isAuthenticated(); if (isAuthenticated) return "redirect:/"; + + // B선라인 + String blineCode = request.getParameter("blineCode"); + if (blineCode != null && blineCode.length() != 0){ + } + else { + blineCode = "N"; + } + model.addAttribute("blineCode", blineCode); + return "web/login/usrSelectDept"; } @@ -309,6 +319,15 @@ public class EgovLoginController { } + // B선라인 + String blineCode = request.getParameter("blineCode"); + if (blineCode != null && blineCode.length() != 0){ + } + else { + blineCode = "N"; + } + model.addAttribute("blineCode", blineCode); + return "web/login/usrCheckTerms"; } @@ -446,6 +465,15 @@ public class EgovLoginController { */ model.addAttribute("mberManageVO", mberManageVO); + // B선라인 + String blineCode = request.getParameter("blineCode"); + if (blineCode != null && blineCode.length() != 0){ + } + else { + blineCode = "N"; + } + model.addAttribute("blineCode", blineCode); + return "web/login/usrInsertView"; } diff --git a/src/main/java/itn/let/uss/umt/service/MberManageVO.java b/src/main/java/itn/let/uss/umt/service/MberManageVO.java index b70b1439..2fb01a0a 100644 --- a/src/main/java/itn/let/uss/umt/service/MberManageVO.java +++ b/src/main/java/itn/let/uss/umt/service/MberManageVO.java @@ -491,6 +491,22 @@ public class MberManageVO extends UserDefaultVO{ private String hotlineAgentCode; //회원 전용 전송사 코드 정보 + private String blineCode; // B라인코드 + private String recommendId; // 추천아이디 + + public String getBlineCode() { + return blineCode; + } + public void setBlineCode(String blineCode) { + this.blineCode = blineCode; + } + public String getRecommendId() { + return recommendId; + } + public void setRecommendId(String recommendId) { + this.recommendId = recommendId; + } + public int getTodayStopCnt() { return todayStopCnt; } diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml index 6c802c3b..645ab41e 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml @@ -986,6 +986,19 @@ ) + + UPDATE lettngnrlmber + SET + BLINE_CODE = #blineCode# + , RECOMMEND_ID = #recommendId# + , HOTLINE_AGENT_CODE = + CASE + WHEN #blineCode# = 'B1' THEN '08' + WHEN #blineCode# = 'B2' THEN '09' + ELSE '00' + END + WHERE MBER_ID = #mberId# + UPDATE diff --git a/src/main/webapp/WEB-INF/jsp/web/login/usrCheckTerms.jsp b/src/main/webapp/WEB-INF/jsp/web/login/usrCheckTerms.jsp index 374691aa..7d1ff9e8 100644 --- a/src/main/webapp/WEB-INF/jsp/web/login/usrCheckTerms.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/login/usrCheckTerms.jsp @@ -22,9 +22,13 @@