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 @@ 내용 -

+