From f5fe5ea6dd3ba3e92fd29daa11c6de749fa5c619 Mon Sep 17 00:00:00 2001 From: tolag3 Date: Wed, 4 Oct 2023 11:15:16 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A4=80=ED=98=B8=20=EC=A0=84?= =?UTF-8?q?=EC=9E=90=EC=A1=B0=EC=A0=95=EC=8B=9C=EC=8A=A4=ED=85=9C=20?= =?UTF-8?q?=EC=BB=A4=EB=B0=8B=20=20-=20=EC=A1=B0=EC=A0=95=EC=A7=84?= =?UTF-8?q?=ED=96=89=EC=83=81=EC=84=B8=20>=20=EB=AC=B8=EC=9E=90=EB=B0=9C?= =?UTF-8?q?=EC=86=A1=20=EA=B8=B0=EB=B3=B8=20=ED=85=8D=EC=8A=A4=ED=8A=B8?= =?UTF-8?q?=EB=A1=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=ED=95=9C=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EC=9E=90=EC=9D=98=20=EB=B2=88=ED=98=B8=20=EB=84=A3?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kcc/kccadr/adjPgrMgr/apm/web/ApmController.java | 6 +++++- .../kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java | 11 +++++++++++ .../let/uat/uia/service/impl/EgovSessionMapping.java | 4 ++++ .../egovframework/spring/com/context-security.xml | 2 +- .../WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp | 2 ++ .../jsp/kccadr/adjPgrMgr/apm/popup/smsSendPop.jsp | 2 +- 6 files changed, 24 insertions(+), 3 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 2dcb783c..c8350f00 100644 --- a/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java +++ b/src/main/java/kcc/kccadr/adjPgrMgr/apm/web/ApmController.java @@ -426,6 +426,9 @@ public class ApmController { LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + //문자발송 팝업에 전달할 데이터 + model.addAttribute("adminPhone", loginVO.getPhone()); + // 조정사건일반 PgrCmmVO info = cmmService.selectPgrCmm(cmmVO); @@ -619,12 +622,13 @@ public class ApmController { List person = adjReqMgrService.selectAdjstReqMgrPersonList(adjReqMgrVO); decryptInfomation(person ,null); - model.addAttribute("person", person); + model.addAttribute("person", person); //처리일자 PgrCmmVO adrEndDeDayVO = new PgrCmmVO(); adrEndDeDayVO.setAdrSeq(cmmVO.getAdrSeq()); model.addAttribute("adrEndDeDay", cmmService.selectAdrEndDeDay(adrEndDeDayVO).getAdrEndDeDay()); + }catch(Exception ex) { ex.printStackTrace(); } diff --git a/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java b/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java index 0c391766..cbaf2822 100644 --- a/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java +++ b/src/main/java/kcc/kccadr/adjreqmgr/service/AdjReqMgrVO.java @@ -283,6 +283,8 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{ private String emailTo; // 이메일 발송 수신자 private String emailFrom; // 이메일 발송 발신자 + private String adminPhone; //관리자 전화번호 + public String getEmailTitle() { return emailTitle; @@ -1298,4 +1300,13 @@ public class AdjReqMgrVO extends ComDefaultVO implements Serializable{ public void setEmailFrom(String emailFrom) { this.emailFrom = emailFrom; } + public String getAdminPhone() { + return adminPhone; + } + public void setAdminPhone(String adminPhone) { + this.adminPhone = adminPhone; + } + + + } diff --git a/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java b/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java index 482f1b03..f566ebd4 100644 --- a/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java +++ b/src/main/java/kcc/let/uat/uia/service/impl/EgovSessionMapping.java @@ -65,6 +65,8 @@ public class EgovSessionMapping extends EgovUsersByUsernameMapping { String strAuthority = rs.getString("authority"); String strMberSeq = rs.getString("mber_seq"); String ofcpsNm = rs.getString("ofcps_nm"); + + String offmTelno = rs.getString("offm_telno").toString(); // 세션 항목 설정 @@ -83,6 +85,8 @@ public class EgovSessionMapping extends EgovUsersByUsernameMapping { /*20221012 대시보드를 위해 직급 코드 추가*/ loginVO.setOfcpsNm(ofcpsNm); + + loginVO.setPhone(offmTelno); return new EgovUserDetails(strUserId, strPassWord, strEnabled, loginVO); } diff --git a/src/main/resources/egovframework/spring/com/context-security.xml b/src/main/resources/egovframework/spring/com/context-security.xml index 6b048861..de87751b 100644 --- a/src/main/resources/egovframework/spring/com/context-security.xml +++ b/src/main/resources/egovframework/spring/com/context-security.xml @@ -32,7 +32,7 @@ jdbcUsersByUsernameQuery="SELECT USER_ID, ESNTL_ID AS PASSWORD, 1 ENABLED, USER_NM, USER_ZIP, USER_ADRES, USER_EMAIL, USER_SE, '-' ORGNZT_ID, ESNTL_ID, - '-' ORGNZT_NM, AUTHOR_CODE AS AUTHORITY, mber_seq AS mber_seq, ofcps_nm as ofcps_nm + '-' ORGNZT_NM, AUTHOR_CODE AS AUTHORITY, mber_seq AS mber_seq, ofcps_nm as ofcps_nm, offm_telno AS offm_telno FROM COMVNUSERMASTER A INNER JOIN LETTNEMPLYRSCRTYESTBS B ON A.ESNTL_ID = B.SCRTY_DTRMN_TRGET_ID WHERE CONCAT(USER_SE, USER_ID) = ?" diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp index f7c46be6..5218a540 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/apmTab0.jsp @@ -817,6 +817,8 @@ $(document).ready(function(){ + + diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/smsSendPop.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/smsSendPop.jsp index 30d6d00f..685db623 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/smsSendPop.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/adjPgrMgr/apm/popup/smsSendPop.jsp @@ -64,7 +64,7 @@ 내용 -

+