From f4496e9356c9abfb89121dc9f1b3dc8c354ebd5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=9C=A0=EC=A7=80=EC=9D=B8?= Date: Tue, 3 Mar 2026 17:51:22 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B0=9C=EC=A3=BC=EA=B8=B0=EA=B4=80=20?= =?UTF-8?q?=EA=B3=84=EC=A0=95=20=EB=93=B1=EB=A1=9D(=EC=9E=85=EB=A0=A5?= =?UTF-8?q?=ED=95=AD=EB=AA=A9=EC=B6=94=EA=B0=80)=20-=20=EC=A0=84=ED=99=94?= =?UTF-8?q?=EB=B2=88=ED=98=B8,=20=EC=A3=BC=EC=86=8C,=20=EB=B6=80=EC=84=9C?= =?UTF-8?q?=EB=AA=85=20=EB=B0=9C=EC=A3=BC=EA=B8=B0=EA=B4=80=20=EA=B3=84?= =?UTF-8?q?=EC=A0=95=20=EC=88=98=EC=A0=95=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...nstructionProjectManagementController.java | 72 ++ .../user/service/GeneralUserMngMapper.java | 2 + .../user/service/GeneralUserMngService.java | 2 + .../impl/GeneralUserMngServiceImpl.java | 5 + .../admins/user/GeneralUserMng_SQL.xml | 33 +- .../05_addUser.jsp | 30 +- .../construction-user-mgmt-index.jsp | 12 +- .../editUser.jsp | 653 ++++++++++++++++++ .../webapp/WEB-INF/views/admins/user/02.jsp | 11 + 9 files changed, 807 insertions(+), 13 deletions(-) create mode 100644 src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/editUser.jsp diff --git a/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java b/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java index 2d77fcc..412a497 100644 --- a/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java +++ b/src/main/java/geoinfo/admins/constructionProjectManagement/ConstructionProjectManagementController.java @@ -749,6 +749,78 @@ public class ConstructionProjectManagementController { int resultCnt = masterService.insertWebMemberInClient(params); result.put("resultCnt", resultCnt); + return result; + } + + /** + * 발주기관 계정수정 팝업 + * @param params + * @param model + * @param response + * @param request + * @return + * @throws Exception + */ + @RequestMapping(value = "admins/client/editUser.do") + public String showEditClientPopop(@RequestParam HashMap params, ModelMap model, HttpServletResponse response, HttpServletRequest request) throws Exception { + + if( !UserInfo.isValidSession(request, response, "admin")) { + return ""; + } + + // 지역 목록 + JSONObject jsonObj = new JSONObject(); + + List gDis = masterService.getUserGDisList(params); + jsonObj.put("gDis", gDis); + + model.put("result", jsonObj); + String id = "sogone" ; + String ipAdd = request.getRemoteAddr(); + + params.put("id", id); + params.put("ipAdd", ipAdd); + + EgovMap result = masterService.selectInfo(params); + masterService.selectAccessInfo(params); + + result.put("cls", params.get("cls")); + + model.addAttribute("client", result); + model.addAttribute("result", jsonObj); + + + return "admins/constructionProjectManagement/editUser"; + } + + /** + * 발주기관 계정수정 + * @param request + * @param params + * @param response + * @return + * @throws Exception + */ + @RequestMapping(value = "admins/client/update.do", method = RequestMethod.POST) + @ResponseBody + public Map updateClient(HttpServletRequest request, @RequestParam HashMap params, HttpServletResponse response) throws Exception { + if (!UserInfo.isValidSession(request, response, "admin")) { + return null; + } + strUtil sUtil = new strUtil(); + + String pass2 = ""; + String pass = sUtil.checkNull((String)params.get("passwd")); + + if (!"".equals(pass)) { + pass2 = ScriptUtil.getSha256(pass, "UTF-8").substring(0, 20); + params.put("encPasswd", pass2); + } + Map result = new HashMap<>(); + + int resultCnt = masterService.updateWebMemberInClient(params); + result.put("resultCnt", resultCnt); + return result; } diff --git a/src/main/java/geoinfo/admins/user/service/GeneralUserMngMapper.java b/src/main/java/geoinfo/admins/user/service/GeneralUserMngMapper.java index 3593048..a4a160c 100644 --- a/src/main/java/geoinfo/admins/user/service/GeneralUserMngMapper.java +++ b/src/main/java/geoinfo/admins/user/service/GeneralUserMngMapper.java @@ -20,6 +20,8 @@ public interface GeneralUserMngMapper { public int insertWebMemberInClient(HashMap params) throws Exception; + public int updateWebMemberInClient(HashMap params) throws Exception; + public void selectAccessInfo(HashMap params) throws Exception; public void selectDeleteInfo(HashMap params) throws Exception; diff --git a/src/main/java/geoinfo/admins/user/service/GeneralUserMngService.java b/src/main/java/geoinfo/admins/user/service/GeneralUserMngService.java index 816554f..e5aa4be 100644 --- a/src/main/java/geoinfo/admins/user/service/GeneralUserMngService.java +++ b/src/main/java/geoinfo/admins/user/service/GeneralUserMngService.java @@ -18,6 +18,8 @@ public interface GeneralUserMngService { public int insertWebMemberInClient(HashMap params) throws Exception; + public int updateWebMemberInClient(HashMap params) throws Exception; + public void selectAccessInfo(HashMap params) throws Exception; public void selectDeleteInfo(HashMap params) throws Exception; diff --git a/src/main/java/geoinfo/admins/user/service/impl/GeneralUserMngServiceImpl.java b/src/main/java/geoinfo/admins/user/service/impl/GeneralUserMngServiceImpl.java index 34c70d2..f777820 100644 --- a/src/main/java/geoinfo/admins/user/service/impl/GeneralUserMngServiceImpl.java +++ b/src/main/java/geoinfo/admins/user/service/impl/GeneralUserMngServiceImpl.java @@ -43,6 +43,11 @@ public class GeneralUserMngServiceImpl implements GeneralUserMngService { return masterMapper.insertWebMemberInClient(params); } + @Override + public int updateWebMemberInClient(HashMap params) throws Exception { + return masterMapper.updateWebMemberInClient(params); + } + @Override public void selectAccessInfo(HashMap params) throws Exception { masterMapper.selectAccessInfo(params); diff --git a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml index 9d89cb7..0c24ca7 100644 --- a/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml +++ b/src/main/resources/geoinfo/sqlmap/mappers/admins/user/GeneralUserMng_SQL.xml @@ -112,8 +112,18 @@ WHERE CODE = A.UPJONG_CODE) UPJONG, DECODE(PROJECT_MASTER_COMPANY_CODE,'','0',PROJECT_MASTER_COMPANY_CODE) MASTER_COMPANY_CODE, CLS, - AGREEYN + AGREEYN, + DIS.GL_CODE, + DIS.GM_CODE, + DIS.GS_CODE, + DIS.GF_CODE FROM WEB_MEMBER_IN A + LEFT JOIN (SELECT * + FROM (SELECT DIS.* + ,ROW_NUMBER() OVER (PARTITION BY DISTRICT ORDER BY DISTRICT) RN + FROM TBL_DISTRICT DIS + WHERE USE_YN = 'Y') + WHERE RN = 1) DIS ON DIS.DISTRICT = A.COMPANY_NAME WHERE TRIM(USERID) = #{userId} ]]> @@ -154,11 +164,28 @@ INSERT INTO WEB_MEMBER_IN ( - USERID, PASSWD, USER_NAME, COMPANY_NAME, EMAIL, CLS, PROJECT_MASTER_COMPANY_CODE, LAST_LOGIN_DATE, LOGIN_COUNT, AGREEYN, ENCRYPT_CHANGE, LIQ_YN, GOVEMENT_CODE, CERTIFICATION_YN + USERID, PASSWD, USER_NAME, PHONE, EMAIL, COMPANY_NAME, PART_NAME, ADDRESS, CLS, PROJECT_MASTER_COMPANY_CODE, LAST_LOGIN_DATE, LOGIN_COUNT, AGREEYN, ENCRYPT_CHANGE, LIQ_YN, GOVEMENT_CODE, CERTIFICATION_YN ) VALUES( - #{userid}, #{encPasswd}, #{userName}, #{companyName}, #{email}, '2', (SELECT COM_CODE FROM TBL_MASTER_COMPANY WHERE COM_NAME = #{companyName}), SYSDATE, 0, 'Y', 'Y', 'N', 0, 0 + #{userid}, #{encPasswd}, #{userName}, #{phone}, #{email}, #{companyName}, #{partName}, #{address}, '2', (SELECT COM_CODE FROM TBL_MASTER_COMPANY WHERE COM_NAME = #{companyName}), SYSDATE, 0, 'Y', 'Y', 'N', 0, 0 ) + + + UPDATE WEB_MEMBER_IN + SET USERID = #{userid}, + + PASSWD = #{encPasswd}, + + USER_NAME = #{userName}, + PHONE = #{phone}, + EMAIL = #{email}, + COMPANY_NAME = #{companyName}, + PART_NAME = #{partName}, + ADDRESS = #{address}, + PROJECT_MASTER_COMPANY_CODE = (SELECT COM_CODE FROM TBL_MASTER_COMPANY WHERE COM_NAME = #{companyName}) + WHERE CLS = '2' + AND USERID = #{orgUserid} + option:selected').text() if ((!$('#PROJECT_MASTER_COMPANY_F_CODE').prop('disabled'))) company_nm_val = $('#PROJECT_MASTER_COMPANY_F_CODE > option:selected').text() - // 이메일 유효성검사 if(email_val == "") { $('.td_client_email').append('

이메일을 입력해주세요.

') @@ -365,8 +364,11 @@ button { userid : $('#client_id').val(), passwd : $('#client_pwd').val(), userName : $('#client_nm').val(), + phone : $('#client_phone').val(), companyName: company_nm_val, + partName: $('#client_part_nm').val(), email : $('#client_email').val(), + address : $('#client_address').val(), projectMasterCompanyCode: master_val }, dataType : "json", @@ -548,11 +550,13 @@ button { + + 아이디 - + @@ -562,22 +566,30 @@ button { - - 이름 + 전화번호 + + + 이메일 + + 주소 + + + + 발주처 - + -<%-- - 회사명 + + 부서명 - + - --%> + diff --git a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-user-mgmt-index.jsp b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-user-mgmt-index.jsp index 552d2c9..d213cc2 100644 --- a/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-user-mgmt-index.jsp +++ b/src/main/webapp/WEB-INF/views/admins/constructionProjectManagement/construction-user-mgmt-index.jsp @@ -115,10 +115,16 @@ $(function(){ // 발주기관 등록 function addClientPopup() { var url = context + "/admins/client/05_addUser.do"; - addUser = window.open(url, 'addClient','scrollbars=no,titlebar=no,width=500, height=680',true); + addUser = window.open(url, 'addClient','scrollbars=no,titlebar=no,width=690, height=640',true); addUser.focus(); } +// 발죽관 계정 수정 팝업 +function editClientPopup(userId, cls){ + var url = context + "/admins/client/editUser.do?userId=" + userId + "&cls=" + cls; + editUser = window.open(url, 'editClient','scrollbars=no,titlebar=no,width=690, height=640',true); + editUser.focus(); +} + + + +Insert title here + + + + +
+

발주기관 계정 수정

+
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
아이디 + + +
비밀번호 + + 이름 + +
전화번호 + + 이메일 + +
주소 + +
발주처 + + + + +
부서명 + +
+
+
+ +
+ +
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/admins/user/02.jsp b/src/main/webapp/WEB-INF/views/admins/user/02.jsp index 854bc79..c6c4ad3 100644 --- a/src/main/webapp/WEB-INF/views/admins/user/02.jsp +++ b/src/main/webapp/WEB-INF/views/admins/user/02.jsp @@ -117,6 +117,13 @@ function addClientPopup() { addUser = window.open(url, 'addClient','scrollbars=no,titlebar=no,width=500, height=680',true); addUser.focus(); } + +// 발죽관 계정 수정 팝업 +function editClientPopup(userId, cls){ + var url = context + "/admins/client/editUser.do?userId=" + userId + "&cls=" + cls; + editUser = window.open(url, 'editClient','scrollbars=no,titlebar=no,width=670, height=730',true); + editUser.focus(); +}