diff --git a/src/main/java/kcc/kccadr/sendMgr/web/SendMgrEmailController.java b/src/main/java/kcc/kccadr/sendMgr/web/SendMgrEmailController.java index 992c7f02..29fb1d1f 100644 --- a/src/main/java/kcc/kccadr/sendMgr/web/SendMgrEmailController.java +++ b/src/main/java/kcc/kccadr/sendMgr/web/SendMgrEmailController.java @@ -20,6 +20,9 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import kcc.com.cmm.LoginVO; +import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; import kcc.kccadr.msg.service.MsgMgrService; import kcc.kccadr.sendMgr.service.SendMgrService; @@ -64,66 +67,73 @@ public class SendMgrEmailController { ModelMap model ) { - String emailTop = "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - "" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - "
" + - " " + - " \"한국저작권위원회-저작권" + - " " + - "
" + - "

" + - " "; - model.addAttribute("emailTop", emailTop); - - String emailBottom = "

" + - "
" + - " " + - " " + - " " + - " " + - " " + - " " + - " " + - "
" + - " " + - " \"한국저작권위원회-통합회원" + - " " + - " " + - "

본 메일은 발신전용으로 회신하지 않습니다.

" + - "

" + - " 진주" + - " [우 52851] 경상남도 진주시 소호로 117  대표번호 : 055.792.0000" + - "
" + - " 서울" + - " [우 04323] 서울특별시 용산구 후암로 107, 5/16층.  대표번호 : 02.2669.0010" + - "

" + - "
" + - "
" + - "" + - ""; +// String emailTop = "" + +// "" + +// "" + +// "" + +// "" + +// "" + +// "" + +// "" + +// "" + +// "" + +// "" + +// "" + +// " " + +// " " + +// " " + +// " " + +// " " + +// " " + +// " " + +// " " + +// " " + +// " " + +// " " + +// "
" + +// " " + +// " \"한국저작권위원회-저작권" + +// " " + +// "
" + +// "

" + +// " "; +// +// String emailBottom = "

" + +// "
" + +// " " + +// " " + +// " " + +// " " + +// " " + +// " " + +// " " + +// "
" + +// " " + +// " \"한국저작권위원회-통합회원" + +// " " + +// " " + +// "

본 메일은 발신전용으로 회신하지 않습니다.

" + +// "

" + +// " 진주" + +// " [우 52851] 경상남도 진주시 소호로 117  대표번호 : 055.792.0000" + +// "
" + +// " 서울" + +// " [우 04323] 서울특별시 용산구 후암로 107, 5/16층.  대표번호 : 02.2669.0010" + +// "

" + +// "
" + +// "
" + +// "" + +// ""; + + +// model.addAttribute("emailTop", emailTop); +// model.addAttribute("emailBottom", emailBottom); + + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + + //문자발송 팝업에 전달할 데이터 + model.addAttribute("adminEmail", loginVO.getEmail()); - model.addAttribute("emailBottom", emailBottom); return "/kccadr/sendMgr/emailSendMgr_tabulator"; } diff --git a/src/main/java/kcc/kccadr/sendMgr/web/SendMgrSMSController.java b/src/main/java/kcc/kccadr/sendMgr/web/SendMgrSMSController.java index 530f8c47..5d309ad3 100644 --- a/src/main/java/kcc/kccadr/sendMgr/web/SendMgrSMSController.java +++ b/src/main/java/kcc/kccadr/sendMgr/web/SendMgrSMSController.java @@ -4,11 +4,15 @@ import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import org.springframework.stereotype.Controller; +import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.servlet.ModelAndView; import org.springframework.web.servlet.mvc.support.RedirectAttributes; +import egovframework.rte.fdl.security.userdetails.util.EgovUserDetailsHelper; +import kcc.com.cmm.LoginVO; +import kcc.com.utl.fcc.service.EgovStringUtil; import kcc.kccadr.adjreqmgr.service.AdjReqMgrVO; import kcc.kccadr.cmm.service.SMSOracleService; import kcc.kccadr.sendMgr.service.SendMgrService; @@ -50,7 +54,13 @@ public class SendMgrSMSController { * @Method 설명 : SMS 발송 화면이동 */ @RequestMapping(value = "/kccadr/sendMgr/smsSendMgr.do") - public String smsSendMgrPage() { + public String smsSendMgrPage(ModelMap model) { + + LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated() ? (LoginVO) EgovUserDetailsHelper.getAuthenticatedUser() : null; + String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getUniqId()); + + //문자발송 팝업에 전달할 데이터 + model.addAttribute("adminPhone", loginVO.getPhone()); return "/kccadr/sendMgr/smsSendMgr_tabulator"; } 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 685db623..8ac9e9bd 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 @@ -40,6 +40,9 @@ }); } +
@@ -64,7 +67,10 @@ 내용 -

+

diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/sendMgr/emailSendMgr_tabulator.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/sendMgr/emailSendMgr_tabulator.jsp index 50569245..291c7ea6 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/sendMgr/emailSendMgr_tabulator.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/sendMgr/emailSendMgr_tabulator.jsp @@ -70,10 +70,10 @@ var emailSubject = $("#emailSubject").val(); var emailContent = $("#emailContent").val(); - var emailTop = $("#emailTop").val(); - var emailBottom = $("#emailBottom").val(); +// var emailTop = $("#emailTop").val(); +// var emailBottom = $("#emailBottom").val(); - emailContent = emailTop + emailContent + emailBottom; +// emailContent = emailTop + emailContent + emailBottom; if(sendLength == 0){ alert("수신 메일주소를 입력해 주세요"); @@ -136,7 +136,7 @@ // var table = new Tabulator("#tabulatorArea", { $("#tabulatorArea").tabulator({ //table setup options - height:"500px", + height:"300px", data:tabledata, layout:"fitDataTable", reactiveData:true, @@ -176,11 +176,12 @@ }); } + - "/> - "/> +<%-- "/> --%> +<%-- "/> --%>
@@ -217,9 +218,12 @@ 발송내용 - - 줄바꿈 시 '<br>'을 넣어주세요. -
ex) 줄바꿈시에는 <br>
을 넣어주세요. + + 줄바꿈 시 '<br>'입력필수(예: 안녕하십니까? <br> 귀하의 조정사건 관련으로.......) diff --git a/src/main/webapp/WEB-INF/jsp/kccadr/sendMgr/smsSendMgr_tabulator.jsp b/src/main/webapp/WEB-INF/jsp/kccadr/sendMgr/smsSendMgr_tabulator.jsp index bbabb1ad..3c8ac5e4 100644 --- a/src/main/webapp/WEB-INF/jsp/kccadr/sendMgr/smsSendMgr_tabulator.jsp +++ b/src/main/webapp/WEB-INF/jsp/kccadr/sendMgr/smsSendMgr_tabulator.jsp @@ -125,7 +125,7 @@ // jquery로 만들어서 jquery로 함수 호출 가능 $("#tabulatorArea").tabulator({ //table setup options - height:"500px", + height:"300px", data:tabledata, layout:"fitDataTable", reactiveData:true, @@ -165,7 +165,9 @@ } - + @@ -198,7 +200,10 @@ 발송내용 - +